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

Commit a887cd36 authored by Hans de Goede's avatar Hans de Goede Committed by Sarah Sharp
Browse files

uas: uas_alloc_cmd_urb: drop unused stream_id parameter 



The cmd endpoint never has streams, so the stream_id parameter is unused.

Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarSarah Sharp <sarah.a.sharp@linux.intel.com>
parent 7e50e0be

drivers/usb/storage/uas.c

+2 −3
Original line number Original line Diff line number Diff line
@@ -454,7 +454,7 @@ static struct urb *uas_alloc_sense_urb(struct uas_dev_info *devinfo, gfp_t gfp, 
}

}





static struct urb *uas_alloc_cmd_urb(struct uas_dev_info *devinfo, gfp_t gfp,

static struct urb *uas_alloc_cmd_urb(struct uas_dev_info *devinfo, gfp_t gfp,

					struct scsi_cmnd *cmnd, u16 stream_id)

					struct scsi_cmnd *cmnd)

{

{

	struct usb_device *udev = devinfo->udev;

	struct usb_device *udev = devinfo->udev;

	struct scsi_device *sdev = cmnd->device;

	struct scsi_device *sdev = cmnd->device;
@@ -626,8 +626,7 @@ static int uas_submit_urbs(struct scsi_cmnd *cmnd, 
	}

	}





	if (cmdinfo->state & ALLOC_CMD_URB) {

	if (cmdinfo->state & ALLOC_CMD_URB) {

		cmdinfo->cmd_urb = uas_alloc_cmd_urb(devinfo, gfp, cmnd,

		cmdinfo->cmd_urb = uas_alloc_cmd_urb(devinfo, gfp, cmnd);

						     cmdinfo->stream);

		if (!cmdinfo->cmd_urb)

		if (!cmdinfo->cmd_urb)

			return SCSI_MLQUEUE_DEVICE_BUSY;

			return SCSI_MLQUEUE_DEVICE_BUSY;

		cmdinfo->state &= ~ALLOC_CMD_URB;

		cmdinfo->state &= ~ALLOC_CMD_URB;