hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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: e6a1b7e880 ("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>
This commit is contained in:
Sudip Mukherjee 2016-03-02 17:10:30 +05:30 committed by Takashi Iwai
parent d10a80de04
commit 03367bf7fd
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sound/drivers/portman2x4.c
View File

@ -762,11 +762,6 @@ static int snd_portman_probe(struct platform_device *pdev)
err = -EIO; err = -EIO;
goto free_pardev; goto free_pardev;
} }
err = portman_probe(p);
if (err) {
err = -EIO;
goto release_pardev;
}
if ((err = portman_create(card, pardev, &pm)) < 0) { if ((err = portman_create(card, pardev, &pm)) < 0) {
snd_printd("Cannot create main component\n"); 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_data = pm;
card->private_free = snd_portman_card_private_free; 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) { if ((err = snd_portman_rawmidi_create(card)) < 0) {
snd_printd("Creating Rawmidi component failed\n"); snd_printd("Creating Rawmidi component failed\n");