aboutsummaryrefslogtreecommitdiff
path: root/drivers/media
diff options
context:
space:
mode:
authorDouglas Schilling Landgraf <dougsland@redhat.com>2009-02-08 10:45:34 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-03-30 12:42:44 -0300
commit3e099baff451affd13a93c6fed216943e01b80fd (patch)
tree7e33bb858ed4afc80426ce00d00f7cffa0566465 /drivers/media
parent56ee38071fe0cf1746d53c5b40a46a835b24fbe4 (diff)
V4L/DVB (10517): em28xx: remove bad check (changeset a31c595188af)
Removed bad check. Thanks to Robert Krakora <rob.krakora@messagenetsystems.com> to report that. Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/video/em28xx/em28xx-audio.c16
1 files changed, 2 insertions, 14 deletions
diff --git a/drivers/media/video/em28xx/em28xx-audio.c b/drivers/media/video/em28xx/em28xx-audio.c
index 43e8d7d91a9..7a62c77b848 100644
--- a/drivers/media/video/em28xx/em28xx-audio.c
+++ b/drivers/media/video/em28xx/em28xx-audio.c
@@ -61,7 +61,7 @@ static int em28xx_isoc_audio_deinit(struct em28xx *dev)
int i;
dprintk("Stopping isoc\n");
- for (i = 0; i < dev->isoc_ctl.num_bufs; i++) {
+ for (i = 0; i < EM28XX_AUDIO_BUFS; i++) {
if (!irqs_disabled())
usb_kill_urb(dev->adev.urb[i]);
else
@@ -73,7 +73,6 @@ static int em28xx_isoc_audio_deinit(struct em28xx *dev)
dev->adev.transfer_buffer[i] = NULL;
}
- dev->isoc_ctl.num_bufs = 0;
return 0;
}
@@ -157,8 +156,6 @@ static int em28xx_init_audio_isoc(struct em28xx *dev)
dprintk("Starting isoc transfers\n");
- dev->isoc_ctl.num_bufs = 0;
-
for (i = 0; i < EM28XX_AUDIO_BUFS; i++) {
struct urb *urb;
int j, k;
@@ -200,19 +197,10 @@ static int em28xx_init_audio_isoc(struct em28xx *dev)
for (i = 0; i < EM28XX_AUDIO_BUFS; i++) {
errCode = usb_submit_urb(dev->adev.urb[i], GFP_ATOMIC);
if (errCode) {
- if (dev->isoc_ctl.num_bufs == 0) {
- usb_free_urb(dev->adev.urb[i]);
- dev->adev.urb[i] = NULL;
- kfree(dev->adev.transfer_buffer[i]);
- dev->adev.transfer_buffer[i] = NULL;
- } else
- em28xx_isoc_audio_deinit(dev);
+ em28xx_isoc_audio_deinit(dev);
return errCode;
}
- mutex_lock(&dev->lock);
- dev->isoc_ctl.num_bufs++;
- mutex_unlock(&dev->lock);
}
return 0;