summaryrefslogtreecommitdiff
path: root/sound/drivers
diff options
context:
space:
mode:
authorSudip Mukherjee <sudipm.mukherjee@gmail.com>2016-02-29 15:13:30 +0300
committerTakashi Iwai <tiwai@suse.de>2016-02-29 15:23:46 +0300
commit0bbf7e025fc89ded4925daeaf3619722b13b12d4 (patch)
treeaec62ff32406b1f15e893e63e2cad57941d11415 /sound/drivers
parent1387e3eafa94837342b044b429b79830998009ac (diff)
downloadlinux-0bbf7e025fc89ded4925daeaf3619722b13b12d4.tar.xz
ALSA: mts64: fix NULL pointer dereference
While registering pardev, the irq_func was also registered. As a result when we tried to probe for the card, an interrupt was generated and in the ISR we tried to dereference private_data. But private_data is still NULL as we have not yet done snd_mts64_create(). Lets probe for the card after mts64 is created. Reported-by: Fengguang Wu <fengguang.wu@intel.com> Fixes: 94a573500d48 ("ALSA: mts64: use new parport device model") Signed-off-by: Sudip Mukherjee <sudip.mukherjee@codethink.co.uk> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/drivers')
-rw-r--r--sound/drivers/mts64.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/sound/drivers/mts64.c b/sound/drivers/mts64.c
index c76bd87071c6..fd4d18df84d3 100644
--- a/sound/drivers/mts64.c
+++ b/sound/drivers/mts64.c
@@ -964,11 +964,6 @@ static int snd_mts64_probe(struct platform_device *pdev)
err = -EIO;
goto free_pardev;
}
- err = mts64_probe(p);
- if (err) {
- err = -EIO;
- goto release_pardev;
- }
if ((err = snd_mts64_create(card, pardev, &mts)) < 0) {
snd_printd("Cannot create main component\n");
@@ -976,6 +971,12 @@ static int snd_mts64_probe(struct platform_device *pdev)
}
card->private_data = mts;
card->private_free = snd_mts64_card_private_free;
+
+ err = mts64_probe(p);
+ if (err) {
+ err = -EIO;
+ goto __err;
+ }
if ((err = snd_mts64_rawmidi_create(card)) < 0) {
snd_printd("Creating Rawmidi component failed\n");