[media] em28xx: remove double checks for urb->status == -ENOENT in urb_data_copy...
authorFrank Schaefer <fschaefer.oss@googlemail.com>
Thu, 8 Nov 2012 17:11:44 +0000 (14:11 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Sat, 22 Dec 2012 20:00:59 +0000 (18:00 -0200)
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>
drivers/media/usb/em28xx/em28xx-dvb.c
drivers/media/usb/em28xx/em28xx-video.c

index fe4d11c67a4e188c1c77f6c8a5fae6e778e0200c..7583cb74d53d6408f94865cb0ecb0b97ac0d197e 100644 (file)
@@ -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;
index a5c1a42f392361afd8eab72d64344b966a060bc1..6bb0b1d74e36beefcaf6d9d2068b9e5ed1d6ff96 100644 (file)
@@ -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)