aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci
diff options
context:
space:
mode:
authorPavel Hofman <pavel.hofman@ivitera.com>2012-01-05 23:05:18 +0100
committerGreg Kroah-Hartman <gregkh@suse.de>2012-01-25 17:24:34 -0800
commit35cdd5ea88762e22c9d21c5c826cbd7ef1edd7db (patch)
treea3a7dfbde3f7b9e74d83410731c3fbe3c89a2737 /sound/pci
parent730580b66c412cd8fbe9c7077ce42c55a85e6281 (diff)
downloadkernel_samsung_aries-35cdd5ea88762e22c9d21c5c826cbd7ef1edd7db.zip
kernel_samsung_aries-35cdd5ea88762e22c9d21c5c826cbd7ef1edd7db.tar.gz
kernel_samsung_aries-35cdd5ea88762e22c9d21c5c826cbd7ef1edd7db.tar.bz2
ALSA: ice1724 - Check for ac97 to avoid kernel oops
commit e7848163aa2a649d9065f230fadff80dc3519775 upstream. 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 <pavel.hofman@ivitera.com> Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'sound/pci')
-rw-r--r--sound/pci/ice1712/amp.c7
1 files changed, 5 insertions, 2 deletions
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;
}