Syncs up with 2.4
diff -urpN --exclude-from=/home/davej/.exclude bk-linus/sound/oss/i810_audio.c linux-2.5/sound/oss/i810_audio.c
--- bk-linus/sound/oss/i810_audio.c 2003-04-25 13:53:16.000000000 +0100
+++ linux-2.5/sound/oss/i810_audio.c 2003-04-26 15:08:06.000000000 +0100
@@ -66,16 +66,19 @@
*
* This driver is cursed. (Ben LaHaise)
*
+ * ICH 3 caveats
+ * Intel errata #7 for ICH3 IO. We need to disable SMI stuff
+ * when codec probing. [Not Yet Done]
*
* ICH 4 caveats
*
- * The ICH4 has the feature, that the codec ID doesn't have to be
- * congruent with the IO connection.
+ * The ICH4 has the feature, that the codec ID doesn't have to be
+ * congruent with the IO connection.
*
- * Therefore, from driver version 0.23 on, there is a "codec ID" <->
- * "IO register base offset" mapping (card->ac97_id_map) field.
+ * Therefore, from driver version 0.23 on, there is a "codec ID" <->
+ * "IO register base offset" mapping (card->ac97_id_map) field.
*
- * Juergen "George" Sawinski (jsaw)
+ * Juergen "George" Sawinski (jsaw)
*/
#include <linux/module.h>
@@ -640,6 +643,10 @@ static void i810_set_dac_channels(struct
int aud_reg;
struct ac97_codec *codec = state->card->ac97_codec[0];
+ /* No codec, no setup */
+ if(codec == NULL)
+ return;
+
aud_reg = i810_ac97_get(codec, AC97_EXTENDED_STATUS);
aud_reg |= AC97_EA_PRI | AC97_EA_PRJ | AC97_EA_PRK;
state->card->ac97_status &= ~(SURR_ON | CENTER_LFE_ON);
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
This archive was generated by hypermail 2b29 : Thu May 15 2003 - 22:00:55 EST