]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
uas: uas_alloc_data_urb: Remove unnecessary use_streams check
authorHans de Goede <hdegoede@redhat.com>
Tue, 12 Nov 2013 09:53:57 +0000 (10:53 +0100)
committerSarah Sharp <sarah.a.sharp@linux.intel.com>
Tue, 4 Mar 2014 23:38:21 +0000 (15:38 -0800)
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>
drivers/usb/storage/uas.c

index 10e580e56d4c39940a09a7150bbcc3f00410f48a..e06505c8f6f07a2c61613b0606ff97eb7c3b42ca 100644 (file)
@@ -429,8 +429,7 @@ static struct urb *uas_alloc_data_urb(struct uas_dev_info *devinfo, gfp_t gfp,
                goto out;
        usb_fill_bulk_urb(urb, udev, pipe, NULL, sdb->length,
                          uas_data_cmplt, cmnd);
-       if (devinfo->use_streams)
-               urb->stream_id = stream_id;
+       urb->stream_id = stream_id;
        urb->num_sgs = udev->bus->sg_tablesize ? sdb->table.nents : 0;
        urb->sg = sdb->table.sgl;
  out: