From d8f34a7e4f3f5261bc21ea87fc7ce980ade837d8 Mon Sep 17 00:00:00 2001 From: Gerd Hoffmann Date: Tue, 25 Sep 2012 10:47:05 +0200 Subject: [PATCH] --- yaml --- r: 326135 b: refs/heads/master c: 03939864954cdfccf41c0a8c20e5f2ba623cc482 h: refs/heads/master i: 326133: 9b1ea331d252d5f15103e5a0b68edbc8eeaf3e22 326131: 98659053a564a437abc8ed7201c310547ced1570 326127: 5c939010466ed6dc815b6b92d7401837618e680b v: v3 --- [refs] | 2 +- trunk/drivers/usb/storage/uas.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 4ff53f3dfdb1..be6e4554e09b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a0e39e346822d115b2446a7c0032d799c48ac1a5 +refs/heads/master: 03939864954cdfccf41c0a8c20e5f2ba623cc482 diff --git a/trunk/drivers/usb/storage/uas.c b/trunk/drivers/usb/storage/uas.c index ab66365adb96..1d326c5e6dea 100644 --- a/trunk/drivers/usb/storage/uas.c +++ b/trunk/drivers/usb/storage/uas.c @@ -611,7 +611,7 @@ static int uas_eh_task_mgmt(struct scsi_cmnd *cmnd, { struct Scsi_Host *shost = cmnd->device->host; struct uas_dev_info *devinfo = (void *)shost->hostdata[0]; - u16 tag = 9999; /* FIXME */ + u16 tag = devinfo->qdepth - 1; memset(&devinfo->response, 0, sizeof(devinfo->response)); if (uas_submit_sense_urb(shost, GFP_NOIO, tag)) { @@ -701,7 +701,7 @@ static int uas_slave_configure(struct scsi_device *sdev) { struct uas_dev_info *devinfo = sdev->hostdata; scsi_set_tag_type(sdev, MSG_ORDERED_TAG); - scsi_activate_tcq(sdev, devinfo->qdepth - 2); + scsi_activate_tcq(sdev, devinfo->qdepth - 3); return 0; } @@ -880,7 +880,7 @@ static int uas_probe(struct usb_interface *intf, const struct usb_device_id *id) init_usb_anchor(&devinfo->data_urbs); uas_configure_endpoints(devinfo); - result = scsi_init_shared_tag_map(shost, devinfo->qdepth - 2); + result = scsi_init_shared_tag_map(shost, devinfo->qdepth - 3); if (result) goto free;