Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eb4459ff authored by Tilman Schmidt's avatar Tilman Schmidt Committed by David S. Miller
Browse files

gigaset: handle isoc frame errors more gracefully 



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

Impact: error handling improvement
Signed-off-by: default avatarTilman Schmidt <tilman@imap.cc>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ee239d99

drivers/isdn/gigaset/bas-gigaset.c

+7 −11
Original line number Diff line number Diff line
@@ -1331,28 +1331,24 @@ static void read_iso_tasklet(unsigned long data) 
		rcvbuf = urb->transfer_buffer;

		totleft = urb->actual_length;

		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,

					 "isochronous read: frame %d: %s\n",

					 frame,

					 "isochronous read: frame %d[%d]: %s\n",

					 frame, numbytes,

					 get_usb_statmsg(

					    urb->iso_frame_desc[frame].status));

				break;

			}

			numbytes = urb->iso_frame_desc[frame].actual_length;

			if (unlikely(numbytes > BAS_MAXFRAME)) {

			if (unlikely(numbytes > BAS_MAXFRAME))

				dev_warn(cs->dev,

					 "isochronous read: frame %d: "

					 "numbytes (%d) > BAS_MAXFRAME\n",

					 frame, numbytes);

				break;

			}

			if (unlikely(numbytes > totleft)) {

				dev_warn(cs->dev,

					 "isochronous read: frame %d: "

					 "numbytes (%d) > totleft (%d)\n",

					 frame, numbytes, totleft);

				break;

				numbytes = totleft;

			}

			offset = urb->iso_frame_desc[frame].offset;

			if (unlikely(offset + numbytes > BAS_INBUFSIZE)) {
@@ -1361,7 +1357,7 @@ static void read_iso_tasklet(unsigned long data) 
					 "offset (%d) + numbytes (%d) "

					 "> BAS_INBUFSIZE\n",

					 frame, offset, numbytes);

				break;

				numbytes = BAS_INBUFSIZE - offset;

			}

			gigaset_isoc_receive(rcvbuf + offset, numbytes, bcs);

			totleft -= numbytes;