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

Commit 8aac863e authored by Gerd Hoffmann's avatar Gerd Hoffmann Committed by Greg Kroah-Hartman
Browse files

uas: improve error handling 



(1) Handle data pipe errors: When the data urb failed we
    didn't transfer anything, update scsi_cmnd accordingly.
(2) Cancel data transfers when we got back an error on the
    status pipe.

Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b1d67693

drivers/usb/storage/uas.c

+13 −1
Original line number Diff line number Diff line
@@ -242,6 +242,13 @@ static void uas_stat_cmplt(struct urb *urb) 
			uas_sense_old(urb, cmnd);

		else

			uas_sense(urb, cmnd);

		if (cmnd->result != 0) {

			/* cancel data transfers on error */

			if (cmdinfo->state & DATA_IN_URB_INFLIGHT)

				usb_unlink_urb(cmdinfo->data_in_urb);

			if (cmdinfo->state & DATA_OUT_URB_INFLIGHT)

				usb_unlink_urb(cmdinfo->data_out_urb);

		}

		cmdinfo->state &= ~COMMAND_INFLIGHT;

		uas_try_complete(cmnd, __func__);

		break;
@@ -272,7 +279,12 @@ static void uas_data_cmplt(struct urb *urb) 
		cmdinfo->state &= ~DATA_OUT_URB_INFLIGHT;

	}

	BUG_ON(sdb == NULL);

	if (urb->status) {

		/* error: no data transfered */

		sdb->resid = sdb->length;

	} else {

		sdb->resid = sdb->length - urb->actual_length;

	}

	uas_try_complete(cmnd, __func__);

}