android/android_kernel_asus_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gigaset: handle isoc frame errors more gracefully

Browse Source 
Don't drop the remainder of an URB if an isochronous frame has an error.

Impact: error handling improvement
Signed-off-by: Tilman Schmidt <tilman@imap.cc>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Tilman Schmidt
2009-10-06 12:18:36 +00:00
committed by David S. Miller
parent ee239d9901
commit eb4459ff3a
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/isdn/gigaset/bas-gigaset.c
View File

@ -1331,28 +1331,24 @@ static void read_iso_tasklet(unsigned long data)
rcvbuf = urb->transfer_buffer; rcvbuf = urb->transfer_buffer;
totleft = urb->actual_length; totleft = urb->actual_length;
for (frame = 0; totleft > 0 && frame < BAS_NUMFRAMES; frame++) { for (frame = 0; totleft > 0 && frame < BAS_NUMFRAMES; frame++) {
if (unlikely(urb->iso_frame_desc[frame].status)) { numbytes = urb->iso_frame_desc[frame].actual_length;
if (unlikely(urb->iso_frame_desc[frame].status))
dev_warn(cs->dev, dev_warn(cs->dev,
"isochronous read: frame %d: %s\n", "isochronous read: frame %d[%d]: %s\n",
frame, frame, numbytes,
get_usb_statmsg( get_usb_statmsg(
urb->iso_frame_desc[frame].status)); urb->iso_frame_desc[frame].status));
break; if (unlikely(numbytes > BAS_MAXFRAME))
}
numbytes = urb->iso_frame_desc[frame].actual_length;
if (unlikely(numbytes > BAS_MAXFRAME)) {
dev_warn(cs->dev, dev_warn(cs->dev,
"isochronous read: frame %d: " "isochronous read: frame %d: "
"numbytes (%d) > BAS_MAXFRAME\n", "numbytes (%d) > BAS_MAXFRAME\n",
frame, numbytes); frame, numbytes);
break;
}
if (unlikely(numbytes > totleft)) { if (unlikely(numbytes > totleft)) {
dev_warn(cs->dev, dev_warn(cs->dev,
"isochronous read: frame %d: " "isochronous read: frame %d: "
"numbytes (%d) > totleft (%d)\n", "numbytes (%d) > totleft (%d)\n",
frame, numbytes, totleft); frame, numbytes, totleft);
break; numbytes = totleft;
} }
offset = urb->iso_frame_desc[frame].offset; offset = urb->iso_frame_desc[frame].offset;
if (unlikely(offset + numbytes > BAS_INBUFSIZE)) { if (unlikely(offset + numbytes > BAS_INBUFSIZE)) {
@ -1361,7 +1357,7 @@ static void read_iso_tasklet(unsigned long data)
"offset (%d) + numbytes (%d) " "offset (%d) + numbytes (%d) "
"> BAS_INBUFSIZE\n", "> BAS_INBUFSIZE\n",
frame, offset, numbytes); frame, offset, numbytes);
break; numbytes = BAS_INBUFSIZE - offset;
} }
gigaset_isoc_receive(rcvbuf + offset, numbytes, bcs); gigaset_isoc_receive(rcvbuf + offset, numbytes, bcs);
totleft -= numbytes; totleft -= numbytes;