aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans de Goede <hdegoede@redhat.com>2013-11-12 04:53:57 -0500
committerSarah Sharp <sarah.a.sharp@linux.intel.com>2014-03-04 18:38:21 -0500
commitc6d4579d4ba24c494d03daf656cd2ff2a9e683c6 (patch)
tree6aa3ec47f9fa51a577c1615372b56014563c7f89
parentf323abcda35ea4bae851c9be8f115ee45cc9cf22 (diff)
uas: uas_alloc_data_urb: Remove unnecessary use_streams check
uas_alloc_data_urb always gets called with a stream_id value of 0 when not using streams. Removing the check makes it consistent with uas_alloc_sense_urb. 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.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/usb/storage/uas.c b/drivers/usb/storage/uas.c
index 10e580e56d4c..e06505c8f6f0 100644
--- a/drivers/usb/storage/uas.c
+++ b/drivers/usb/storage/uas.c
@@ -429,8 +429,7 @@ static struct urb *uas_alloc_data_urb(struct uas_dev_info *devinfo, gfp_t gfp,
429 goto out; 429 goto out;
430 usb_fill_bulk_urb(urb, udev, pipe, NULL, sdb->length, 430 usb_fill_bulk_urb(urb, udev, pipe, NULL, sdb->length,
431 uas_data_cmplt, cmnd); 431 uas_data_cmplt, cmnd);
432 if (devinfo->use_streams) 432 urb->stream_id = stream_id;
433 urb->stream_id = stream_id;
434 urb->num_sgs = udev->bus->sg_tablesize ? sdb->table.nents : 0; 433 urb->num_sgs = udev->bus->sg_tablesize ? sdb->table.nents : 0;
435 urb->sg = sdb->table.sgl; 434 urb->sg = sdb->table.sgl;
436 out: 435 out: