From cc19dd80219d1b2c8c253bf5e7d719f80cde8be4 Mon Sep 17 00:00:00 2001 From: Frank Schaefer Date: Thu, 8 Nov 2012 14:11:44 -0300 Subject: [PATCH] --- yaml --- r: 357133 b: refs/heads/master c: 1653cb0cb27fba2577933a5a2dd8df78a5bca906 h: refs/heads/master i: 357131: b1d7abf1eb70c61ca12b98d884f8bc2ce2255bc1 v: v3 --- [refs] | 2 +- trunk/drivers/media/usb/em28xx/em28xx-dvb.c | 5 +---- trunk/drivers/media/usb/em28xx/em28xx-video.c | 10 ++-------- 3 files changed, 4 insertions(+), 13 deletions(-) diff --git a/[refs] b/[refs] index bfe78ab8173c..5fc4f08bae78 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 337fe8dad58692ac468f4139ea19624ce464d953 +refs/heads/master: 1653cb0cb27fba2577933a5a2dd8df78a5bca906 diff --git a/trunk/drivers/media/usb/em28xx/em28xx-dvb.c b/trunk/drivers/media/usb/em28xx/em28xx-dvb.c index fe4d11c67a4e..7583cb74d53d 100644 --- a/trunk/drivers/media/usb/em28xx/em28xx-dvb.c +++ b/trunk/drivers/media/usb/em28xx/em28xx-dvb.c @@ -134,11 +134,8 @@ static inline int em28xx_dvb_isoc_copy(struct em28xx *dev, struct urb *urb) if ((dev->state & DEV_DISCONNECTED) || (dev->state & DEV_MISCONFIGURED)) return 0; - if (urb->status < 0) { + if (urb->status < 0) print_err_status(dev, -1, urb->status); - if (urb->status == -ENOENT) - return 0; - } for (i = 0; i < urb->number_of_packets; i++) { int status = urb->iso_frame_desc[i].status; diff --git a/trunk/drivers/media/usb/em28xx/em28xx-video.c b/trunk/drivers/media/usb/em28xx/em28xx-video.c index a5c1a42f3923..6bb0b1d74e36 100644 --- a/trunk/drivers/media/usb/em28xx/em28xx-video.c +++ b/trunk/drivers/media/usb/em28xx/em28xx-video.c @@ -429,11 +429,8 @@ static inline int em28xx_isoc_copy(struct em28xx *dev, struct urb *urb) if ((dev->state & DEV_DISCONNECTED) || (dev->state & DEV_MISCONFIGURED)) return 0; - if (urb->status < 0) { + if (urb->status < 0) print_err_status(dev, -1, urb->status); - if (urb->status == -ENOENT) - return 0; - } buf = dev->usb_ctl.vid_buf; if (buf != NULL) @@ -525,11 +522,8 @@ static inline int em28xx_isoc_copy_vbi(struct em28xx *dev, struct urb *urb) if ((dev->state & DEV_DISCONNECTED) || (dev->state & DEV_MISCONFIGURED)) return 0; - if (urb->status < 0) { + if (urb->status < 0) print_err_status(dev, -1, urb->status); - if (urb->status == -ENOENT) - return 0; - } buf = dev->usb_ctl.vid_buf; if (buf != NULL)