Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 357133
b: refs/heads/master
c: 1653cb0
h: refs/heads/master
i:
  357131: b1d7abf
v: v3
  • Loading branch information
Frank Schaefer authored and Mauro Carvalho Chehab committed Dec 22, 2012
1 parent 56adb41 commit cc19dd8
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 13 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 337fe8dad58692ac468f4139ea19624ce464d953
refs/heads/master: 1653cb0cb27fba2577933a5a2dd8df78a5bca906
5 changes: 1 addition & 4 deletions trunk/drivers/media/usb/em28xx/em28xx-dvb.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
10 changes: 2 additions & 8 deletions trunk/drivers/media/usb/em28xx/em28xx-video.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down

0 comments on commit cc19dd8

Please sign in to comment.