summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2009-01-18 23:06:34 -0200
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-01-18 23:06:34 -0200
commitbdfe31cd2515c9c28375bce881f8de58df410a9f (patch)
tree393f47072321dbd99fb5d2b19a0de1f7ca8b5c40 /linux/drivers/media/video
parent40ad14e978aaf97d97abb4f96789420385ce1d1b (diff)
parentfcb4d19e498b27e308bf7549d34a553baae8964e (diff)
downloadmediapointer-dvb-s2-bdfe31cd2515c9c28375bce881f8de58df410a9f.tar.gz
mediapointer-dvb-s2-bdfe31cd2515c9c28375bce881f8de58df410a9f.tar.bz2
merge: http://linuxtv.org/hg/~dheitmueller/v4l-dvb-em28xx-audio-panic/
From: Mauro Carvalho Chehab <mchehab@redhat.com> Priority: normal Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video')
-rw-r--r--linux/drivers/media/video/em28xx/em28xx-audio.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/linux/drivers/media/video/em28xx/em28xx-audio.c b/linux/drivers/media/video/em28xx/em28xx-audio.c
index 0d6a3a9ec..62dab8696 100644
--- a/linux/drivers/media/video/em28xx/em28xx-audio.c
+++ b/linux/drivers/media/video/em28xx/em28xx-audio.c
@@ -63,7 +63,7 @@ static int em28xx_isoc_audio_deinit(struct em28xx *dev)
dprintk("Stopping isoc\n");
for (i = 0; i < EM28XX_AUDIO_BUFS; i++) {
- usb_unlink_urb(dev->adev.urb[i]);
+ usb_kill_urb(dev->adev.urb[i]);
usb_free_urb(dev->adev.urb[i]);
dev->adev.urb[i] = NULL;