aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans de Goede <hdegoede@redhat.com>2013-10-17 13:47:28 -0400
committerSarah Sharp <sarah.a.sharp@linux.intel.com>2014-03-04 18:38:08 -0500
commita887cd366347c38607f0d9c28ca2baed40cac8fc (patch)
treebabe9f249e0ad0904e2d9f921fb67c96985c0aa8
parent7e50e0bec45897caeb978e5aecc9184a2dc00df2 (diff)
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: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com>
-rw-r--r--drivers/usb/storage/uas.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/usb/storage/uas.c b/drivers/usb/storage/uas.c
index dcaf61197032..5eacb8054457 100644
--- a/drivers/usb/storage/uas.c
+++ b/drivers/usb/storage/uas.c
@@ -454,7 +454,7 @@ static struct urb *uas_alloc_sense_urb(struct uas_dev_info *devinfo, gfp_t gfp,
454} 454}
455 455
456static struct urb *uas_alloc_cmd_urb(struct uas_dev_info *devinfo, gfp_t gfp, 456static struct urb *uas_alloc_cmd_urb(struct uas_dev_info *devinfo, gfp_t gfp,
457 struct scsi_cmnd *cmnd, u16 stream_id) 457 struct scsi_cmnd *cmnd)
458{ 458{
459 struct usb_device *udev = devinfo->udev; 459 struct usb_device *udev = devinfo->udev;
460 struct scsi_device *sdev = cmnd->device; 460 struct scsi_device *sdev = cmnd->device;
@@ -626,8 +626,7 @@ static int uas_submit_urbs(struct scsi_cmnd *cmnd,
626 } 626 }
627 627
628 if (cmdinfo->state & ALLOC_CMD_URB) { 628 if (cmdinfo->state & ALLOC_CMD_URB) {
629 cmdinfo->cmd_urb = uas_alloc_cmd_urb(devinfo, gfp, cmnd, 629 cmdinfo->cmd_urb = uas_alloc_cmd_urb(devinfo, gfp, cmnd);
630 cmdinfo->stream);
631 if (!cmdinfo->cmd_urb) 630 if (!cmdinfo->cmd_urb)
632 return SCSI_MLQUEUE_DEVICE_BUSY; 631 return SCSI_MLQUEUE_DEVICE_BUSY;
633 cmdinfo->state &= ~ALLOC_CMD_URB; 632 cmdinfo->state &= ~ALLOC_CMD_URB;