summaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <m.chehab@samsung.com>2014-01-13 11:32:00 -0300
committerMauro Carvalho Chehab <m.chehab@samsung.com>2014-01-14 14:44:11 -0200
commitb49eb2bd71c39fb69ae9001dac9f07ae6259f9ef (patch)
tree22e406c8a6c75089c8dec1b75b78d7f17c91c29d /drivers/media
parent4b819724984042eff2f14d889b55e906e420fbb3 (diff)
downloadlinux-b49eb2bd71c39fb69ae9001dac9f07ae6259f9ef.tar.gz
linux-b49eb2bd71c39fb69ae9001dac9f07ae6259f9ef.tar.bz2
linux-b49eb2bd71c39fb69ae9001dac9f07ae6259f9ef.zip
[media] em28xx-audio: flush work at .fini
As a pending action might be still there at the work thread, flush it. Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/usb/em28xx/em28xx-audio.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/media/usb/em28xx/em28xx-audio.c b/drivers/media/usb/em28xx/em28xx-audio.c
index 74575e0ed41b..1563f71a5ea2 100644
--- a/drivers/media/usb/em28xx/em28xx-audio.c
+++ b/drivers/media/usb/em28xx/em28xx-audio.c
@@ -967,6 +967,8 @@ 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) {