aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/usb/em28xx/em28xx-video.c
diff options
context:
space:
mode:
authorFrank Schaefer <fschaefer.oss@googlemail.com>2012-11-08 12:11:44 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-12-22 15:00:59 -0500
commit1653cb0cb27fba2577933a5a2dd8df78a5bca906 (patch)
tree601b7de64f48c5fb0cfb14ce06b5a49937389b66 /drivers/media/usb/em28xx/em28xx-video.c
parent337fe8dad58692ac468f4139ea19624ce464d953 (diff)
[media] em28xx: remove double checks for urb->status == -ENOENT in urb_data_copy functions
This check is already done in the URB handler em28xx_irq_callback before calling these functions. Signed-off-by: Frank Schäfer <fschaefer.oss@googlemail.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/usb/em28xx/em28xx-video.c')
-rw-r--r--drivers/media/usb/em28xx/em28xx-video.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/drivers/media/usb/em28xx/em28xx-video.c b/drivers/media/usb/em28xx/em28xx-video.c
index a5c1a42f3923..6bb0b1d74e36 100644
--- a/drivers/media/usb/em28xx/em28xx-video.c
+++ b/drivers/media/usb/em28xx/em28xx-video.c
@@ -429,11 +429,8 @@ static inline int em28xx_isoc_copy(struct em28xx *dev, struct urb *urb)
429 if ((dev->state & DEV_DISCONNECTED) || (dev->state & DEV_MISCONFIGURED)) 429 if ((dev->state & DEV_DISCONNECTED) || (dev->state & DEV_MISCONFIGURED))
430 return 0; 430 return 0;
431 431
432 if (urb->status < 0) { 432 if (urb->status < 0)
433 print_err_status(dev, -1, urb->status); 433 print_err_status(dev, -1, urb->status);
434 if (urb->status == -ENOENT)
435 return 0;
436 }
437 434
438 buf = dev->usb_ctl.vid_buf; 435 buf = dev->usb_ctl.vid_buf;
439 if (buf != NULL) 436 if (buf != NULL)
@@ -525,11 +522,8 @@ static inline int em28xx_isoc_copy_vbi(struct em28xx *dev, struct urb *urb)
525 if ((dev->state & DEV_DISCONNECTED) || (dev->state & DEV_MISCONFIGURED)) 522 if ((dev->state & DEV_DISCONNECTED) || (dev->state & DEV_MISCONFIGURED))
526 return 0; 523 return 0;
527 524
528 if (urb->status < 0) { 525 if (urb->status < 0)
529 print_err_status(dev, -1, urb->status); 526 print_err_status(dev, -1, urb->status);
530 if (urb->status == -ENOENT)
531 return 0;
532 }
533 527
534 buf = dev->usb_ctl.vid_buf; 528 buf = dev->usb_ctl.vid_buf;
535 if (buf != NULL) 529 if (buf != NULL)