projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branches 'asoc/fix/davinci', 'asoc/fix/es8328', 'asoc/fix/fsl...
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
usb
/
storage
/
uas.c
diff --git
a/drivers/usb/storage/uas.c
b/drivers/usb/storage/uas.c
index 48ca9c204354168f079a1e9e5ceaf2ac4b74a0f5..e6915166443607283f8229eaca83fac38ed68377 100644
(file)
--- a/
drivers/usb/storage/uas.c
+++ b/
drivers/usb/storage/uas.c
@@
-812,7
+812,6
@@
static struct scsi_host_template uas_host_template = {
.this_id = -1,
.sg_tablesize = SG_NONE,
.skip_settle_delay = 1,
.this_id = -1,
.sg_tablesize = SG_NONE,
.skip_settle_delay = 1,
- .use_blk_tags = 1,
};
#define UNUSUAL_DEV(id_vendor, id_product, bcdDeviceMin, bcdDeviceMax, \
};
#define UNUSUAL_DEV(id_vendor, id_product, bcdDeviceMin, bcdDeviceMax, \
@@
-929,10
+928,6
@@
static int uas_probe(struct usb_interface *intf, const struct usb_device_id *id)
if (result)
goto set_alt0;
if (result)
goto set_alt0;
- result = scsi_init_shared_tag_map(shost, devinfo->qdepth - 2);
- if (result)
- goto free_streams;
-
usb_set_intfdata(intf, shost);
result = scsi_add_host(shost, &intf->dev);
if (result)
usb_set_intfdata(intf, shost);
result = scsi_add_host(shost, &intf->dev);
if (result)