From: Pavel Hofman Date: Thu, 5 Jan 2012 22:05:18 +0000 (+0100) Subject: ALSA: ice1724 - Check for ac97 to avoid kernel oops X-Git-Tag: v3.12-rc1~3017^2~117^2~17 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e7848163aa2a649d9065f230fadff80dc3519775;p=kernel%2Fkernel-generic.git ALSA: ice1724 - Check for ac97 to avoid kernel oops Cards with identical PCI ids but no AC97 config in EEPROM do not have the ac97 field initialized. We must check for this case to avoid kernel oops. Signed-off-by: Pavel Hofman Cc: Signed-off-by: Takashi Iwai --- diff --git a/sound/pci/ice1712/amp.c b/sound/pci/ice1712/amp.c index e328cfb..e525da2 100644 --- a/sound/pci/ice1712/amp.c +++ b/sound/pci/ice1712/amp.c @@ -68,8 +68,11 @@ static int __devinit snd_vt1724_amp_init(struct snd_ice1712 *ice) static int __devinit snd_vt1724_amp_add_controls(struct snd_ice1712 *ice) { - /* we use pins 39 and 41 of the VT1616 for left and right read outputs */ - snd_ac97_write_cache(ice->ac97, 0x5a, snd_ac97_read(ice->ac97, 0x5a) & ~0x8000); + if (ice->ac97) + /* we use pins 39 and 41 of the VT1616 for left and right + read outputs */ + snd_ac97_write_cache(ice->ac97, 0x5a, + snd_ac97_read(ice->ac97, 0x5a) & ~0x8000); return 0; }