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

Commit 85fea825 authored by Hans de Goede's avatar Hans de Goede Committed by Greg Kroah-Hartman
Browse files

uas: Free data urbs on completion 



Now that we no longer drop our lock to unlink the data urbs, we can simply
free them on completion, making their handling consistent with the other urbs.

Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 60d9f67d

drivers/usb/storage/uas.c

+3 −2
Original line number Diff line number Diff line
@@ -288,8 +288,6 @@ static int uas_try_complete(struct scsi_cmnd *cmnd, const char *caller) 
		return -EBUSY;

	WARN_ON_ONCE(cmdinfo->state & COMMAND_COMPLETED);

	cmdinfo->state |= COMMAND_COMPLETED;

	usb_free_urb(cmdinfo->data_in_urb);

	usb_free_urb(cmdinfo->data_out_urb);

	if (cmdinfo->state & COMMAND_ABORTED)

		scmd_printk(KERN_INFO, cmnd, "abort completed\n");

	list_del(&cmdinfo->list);
@@ -418,9 +416,11 @@ static void uas_data_cmplt(struct urb *urb) 
	if (cmdinfo->data_in_urb == urb) {

		sdb = scsi_in(cmnd);

		cmdinfo->state &= ~DATA_IN_URB_INFLIGHT;

		cmdinfo->data_in_urb = NULL;

	} else if (cmdinfo->data_out_urb == urb) {

		sdb = scsi_out(cmnd);

		cmdinfo->state &= ~DATA_OUT_URB_INFLIGHT;

		cmdinfo->data_out_urb = NULL;

	}

	if (sdb == NULL) {

		WARN_ON_ONCE(1);
@@ -450,6 +450,7 @@ static void uas_data_cmplt(struct urb *urb) 
	}

	uas_try_complete(cmnd, __func__);

out:

	usb_free_urb(urb);

	spin_unlock_irqrestore(&devinfo->lock, flags);

}