summaryrefslogtreecommitdiff
path: root/sound/pci
diff options
context:
space:
mode:
authorSean Connor <sconnor004@allyinics.org>2013-02-28 09:20:00 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-03-14 11:29:50 -0700
commit1515f18665088e33e35706bd35268a16e8e7665d (patch)
treecb54a188347e40c805429826ae1b4fcb726fddd0 /sound/pci
parent724285cf2c0ef53c2217a6a866ab50d57c386292 (diff)
ALSA: ice1712: Initialize card->private_data properly
commit 69a4cfdd444d1fe5c24d29b3a063964ac165d2cd upstream. Set card->private_data in snd_ice1712_create for fixing NULL dereference in snd_ice1712_remove(). Signed-off-by: Sean Connor <sconnor004@allyinics.org> Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'sound/pci')
-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 132a86e09d07..08c7f3a91a81 100644
--- a/sound/pci/ice1712/ice1712.c
+++ b/sound/pci/ice1712/ice1712.c
@@ -2595,6 +2595,8 @@ static int __devinit 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);