Commit fb697abe authored by Dave Jones's avatar Dave Jones Committed by Linus Torvalds

[PATCH] i810 no codec fix.

Syncs up with 2.4
parent 3ab340dc
...@@ -66,6 +66,9 @@ ...@@ -66,6 +66,9 @@
* *
* This driver is cursed. (Ben LaHaise) * 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 * ICH 4 caveats
* *
...@@ -640,6 +643,10 @@ static void i810_set_dac_channels(struct i810_state *state, int channel) ...@@ -640,6 +643,10 @@ static void i810_set_dac_channels(struct i810_state *state, int channel)
int aud_reg; int aud_reg;
struct ac97_codec *codec = state->card->ac97_codec[0]; 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 = i810_ac97_get(codec, AC97_EXTENDED_STATUS);
aud_reg |= AC97_EA_PRI | AC97_EA_PRJ | AC97_EA_PRK; aud_reg |= AC97_EA_PRI | AC97_EA_PRJ | AC97_EA_PRK;
state->card->ac97_status &= ~(SURR_ON | CENTER_LFE_ON); state->card->ac97_status &= ~(SURR_ON | CENTER_LFE_ON);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment