redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

em28xx-alsa: Fix error patch for init/fini 

If something bad happens during init, we free the card data.
However, we still keep it initialized, causing some dependent
code to be called at .fini.

Fix it.

Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
hifive-unleashed-5.1
Mauro Carvalho Chehab 2014-01-14 14:49:04 -02:00
parent b49eb2bd71
commit 452f236fcf
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/media/usb/em28xx/em28xx-audio.c
View File

@ -948,6 +948,7 @@ urb_free:
card_free:
snd_card_free(card);
adev->sndcard = NULL;
return err;
}
@ -966,12 +967,12 @@ static int em28xx_audio_fini(struct em28xx *dev)
em28xx_info("Closing audio extension");
snd_card_disconnect(dev->adev.sndcard);
flush_work(&dev->wq_trigger);
em28xx_audio_free_urb(dev);
if (dev->adev.sndcard) {
snd_card_disconnect(dev->adev.sndcard);
flush_work(&dev->wq_trigger);
em28xx_audio_free_urb(dev);
snd_card_free(dev->adev.sndcard);
dev->adev.sndcard = NULL;
}