summaryrefslogtreecommitdiff
path: root/sound/drivers/portman2x4.c
diff options
context:
space:
mode:
authorSudip Mukherjee <sudipm.mukherjee@gmail.com>2016-03-02 17:10:30 +0530
committerTakashi Iwai <tiwai@suse.de>2016-03-02 16:23:24 +0100
commit03367bf7fd30165bda3b037b3078cfa231ba33b7 (patch)
tree1d37e69797f7403db6b507e4b380d83a17bafc8a /sound/drivers/portman2x4.c
parentd10a80de04a3a8c0d7c1567cbc0a8d2e1181c10a (diff)
ALSA: portman2x4: 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 portman_create(). Lets probe for the device after card is created. Fixes: e6a1b7e88046 ("ALSA: portman2x4 - 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/portman2x4.c')
-rw-r--r--sound/drivers/portman2x4.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/sound/drivers/portman2x4.c b/sound/drivers/portman2x4.c
index 362533fceec7..189e3e7028af 100644
--- a/sound/drivers/portman2x4.c
+++ b/sound/drivers/portman2x4.c
@@ -762,11 +762,6 @@ static int snd_portman_probe(struct platform_device *pdev)
err = -EIO;
goto free_pardev;
}
- err = portman_probe(p);
- if (err) {
- err = -EIO;
- goto release_pardev;
- }
if ((err = portman_create(card, pardev, &pm)) < 0) {
snd_printd("Cannot create main component\n");
@@ -774,6 +769,12 @@ static int snd_portman_probe(struct platform_device *pdev)
}
card->private_data = pm;
card->private_free = snd_portman_card_private_free;
+
+ err = portman_probe(p);
+ if (err) {
+ err = -EIO;
+ goto __err;
+ }
if ((err = snd_portman_rawmidi_create(card)) < 0) {
snd_printd("Creating Rawmidi component failed\n");