--- linux/sound/oss/ac97_codec.c	Fri Mar  8 03:18:13 2002
+++ linux-jp8/sound/oss/ac97_codec.c	Thu Mar 14 15:48:39 2002
@@ -31,6 +31,8 @@
  **************************************************************************
  *
  * History
+ * v0.4a Mar 12 2002 Jörg Prante <joerg@infolinux.de>
+ *  minor fix: do not probe for modem codec
  * v0.4 Mar 15 2000 Ollie Lho
  *	dual codecs support verified with 4 channels output
  * v0.3 Feb 22 2000 Ollie Lho
@@ -691,8 +693,15 @@
 	}
 
 	/* probe for Modem Codec */
+#if CONFIG_SOUND_NO_MODEM_PROBE
+	/* Do not probe for Modem Codec. 
+	   This prevents IrDA lockups on some laptops (Dell Inspiron)
+       when sound is initialized after IrDA init. -jprante */
+	modem = 0; 
+#else
 	codec->codec_write(codec, AC97_EXTENDED_MODEM_ID, 0L);
 	modem = codec->codec_read(codec, AC97_EXTENDED_MODEM_ID);
+#endif
 
 	codec->name = NULL;
 	codec->codec_ops = &null_ops;
--- linux/sound/oss/Config.in	Thu Mar 14 00:42:48 2002
+++ linux-jp8/sound/oss/Config.in	Thu Mar 14 15:53:32 2002
@@ -4,6 +4,11 @@
 # More hacking for modularisation.
 #
 
+# Do not probe for modem codec option. This is a workaround to prevent 
+# hard IrDA lockups on some laptops (Dell Inspiron). -jprante
+
+bool 'Do not probe for AC97 Modem Codec (prevent IrDA lockup)' CONFIG_SOUND_NO_MODEM_PROBE
+
 # Prompt user for primary drivers.
 
 dep_tristate '  BT878 audio dma' CONFIG_SOUND_BT878 $CONFIG_SOUND