summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorSean Connor <sconnor004@allyinics.org>2013-02-28 18:20:00 +0400
committerTakashi Iwai <tiwai@suse.de>2013-03-07 18:38:58 +0400
commit69a4cfdd444d1fe5c24d29b3a063964ac165d2cd (patch)
tree7d1686b34b07e38368a39637369ac8052f046754 /sound
parent84dfd0ac231f69d70e100e712ad5e5f0092ad46b (diff)
downloadlinux-69a4cfdd444d1fe5c24d29b3a063964ac165d2cd.tar.xz
ALSA: ice1712: Initialize card->private_data properly
Set card->private_data in snd_ice1712_create for fixing NULL dereference in snd_ice1712_remove(). Signed-off-by: Sean Connor <sconnor004@allyinics.org> Cc: <stable@vger.kernel.org> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
-rw-r--r--sound/pci/ice1712/ice1712.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/pci/ice1712/ice1712.c b/sound/pci/ice1712/ice1712.c
index 2ffdc35d5ffd..806407a3973e 100644
--- a/sound/pci/ice1712/ice1712.c
+++ b/sound/pci/ice1712/ice1712.c
@@ -2594,6 +2594,8 @@ static int snd_ice1712_create(struct snd_card *card,
snd_ice1712_proc_init(ice);
synchronize_irq(pci->irq);
+ card->private_data = ice;
+
err = pci_request_regions(pci, "ICE1712");
if (err < 0) {
kfree(ice);