From 7e4aee99684af26e1cde66141a487b82f7990c64 Mon Sep 17 00:00:00 2001 From: Alan Stern Date: Tue, 2 Sep 2008 10:12:11 -0400 Subject: [PATCH] --- yaml --- r: 115753 b: refs/heads/master c: 8bfa24727087d7252f9ecfb5fea2dfc92d797fbd h: refs/heads/master i: 115751: 759719f64995468b6b0967648436c20db53b28d3 v: v3 --- [refs] | 2 +- trunk/drivers/usb/storage/transport.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 4e4e9330b0f4..beb81e985d5e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3948f0e0c999a6201e9898bb8fbe3c6cc1199276 +refs/heads/master: 8bfa24727087d7252f9ecfb5fea2dfc92d797fbd diff --git a/trunk/drivers/usb/storage/transport.c b/trunk/drivers/usb/storage/transport.c index 3523a0bfa0ff..79108d5d3171 100644 --- a/trunk/drivers/usb/storage/transport.c +++ b/trunk/drivers/usb/storage/transport.c @@ -663,7 +663,7 @@ void usb_stor_invoke_transport(struct scsi_cmnd *srb, struct us_data *us) } /* Did we transfer less than the minimum amount required? */ - if (srb->result == SAM_STAT_GOOD && + if ((srb->result == SAM_STAT_GOOD || srb->sense_buffer[2] == 0) && scsi_bufflen(srb) - scsi_get_resid(srb) < srb->underflow) srb->result = (DID_ERROR << 16) | (SUGGEST_RETRY << 24);