projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
068b939
)
ALSA: azt3328 - Fix NULL ptr dereference on cards without OPL3
author
Alban Bedel
<albeu@free.fr>
Sat, 25 Feb 2012 15:15:57 +0000
(16:15 +0100)
committer
Takashi Iwai
<tiwai@suse.de>
Sat, 25 Feb 2012 18:03:18 +0000
(19:03 +0100)
opl3->private_data was set even if opl3 could not be created.
Signed-off-by: Alban Bedel <albeu@free.fr>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/pci/azt3328.c
patch
|
blob
|
history
diff --git
a/sound/pci/azt3328.c
b/sound/pci/azt3328.c
index 95ffa6a9db6e7412e3cca49ab6eb175d55b0983d..496f14c1a731e78071d30c814f6f0e08c143d85e 100644
(file)
--- a/
sound/pci/azt3328.c
+++ b/
sound/pci/azt3328.c
@@
-2684,10
+2684,9
@@
snd_azf3328_probe(struct pci_dev *pci, const struct pci_device_id *pci_id)
err = snd_opl3_hwdep_new(opl3, 0, 1, NULL);
if (err < 0)
goto out_err;
+ opl3->private_data = chip;
}
- opl3->private_data = chip;
-
sprintf(card->longname, "%s at 0x%lx, irq %i",
card->shortname, chip->ctrl_io, chip->irq);