summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/em28xx/em28xx-audio.c
diff options
context:
space:
mode:
authorDevin Heitmueller <dheitmueller@linuxtv.org>2009-01-17 11:41:54 -0500
committerDevin Heitmueller <dheitmueller@linuxtv.org>2009-01-17 11:41:54 -0500
commitfcb4d19e498b27e308bf7549d34a553baae8964e (patch)
tree7a8db1a3009fb67fe47d4e084a2143e83760d103 /linux/drivers/media/video/em28xx/em28xx-audio.c
parentb0fc8c78cb5fd9394d8d4ff3198bdc9390b96001 (diff)
downloadmediapointer-dvb-s2-fcb4d19e498b27e308bf7549d34a553baae8964e.tar.gz
mediapointer-dvb-s2-fcb4d19e498b27e308bf7549d34a553baae8964e.tar.bz2
em28xx: fix kernel panic on audio shutdown
From: Devin Heitmueller <dheitmueller@linuxtv.org> Revert a change made in change 9743 which resulted in a kernel panic in some cases on shutdown of the audio stream. First discovered when working on the Pinnacle 880e support, and later reproduced by a user on the mailing list with the HVR-900 as well. Priority: high Signed-off-by: Devin Heitmueller <dheitmueller@linuxtv.org>
Diffstat (limited to 'linux/drivers/media/video/em28xx/em28xx-audio.c')
-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 34c494d68..ec8b40640 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;
}