diff options
| author | Mark Brown <broonie@kernel.org> | 2016-06-29 17:28:16 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-06-29 17:28:16 +0100 |
| commit | 10d832d607c621c101922442f4771737296e1241 (patch) | |
| tree | 421229d6bb43c301bbf5eb97b11c5901aae66e08 /drivers/scsi/scsi_lib.c | |
| parent | 1a695a905c18548062509178b98bc91e67510864 (diff) | |
| parent | a370f60a58ec7bad7045803041524ccdc4d79c75 (diff) | |
Merge tag 'ib-mfd-regulator-arm-v4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd into regulator-rn5t618
Immutable branch between MFD, Regulator and ARM, due for v4.8
Diffstat (limited to 'drivers/scsi/scsi_lib.c')
| -rw-r--r-- | drivers/scsi/scsi_lib.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c index b2e332af0f51..c71344aebdbb 100644 --- a/drivers/scsi/scsi_lib.c +++ b/drivers/scsi/scsi_lib.c @@ -821,9 +821,12 @@ void scsi_io_completion(struct scsi_cmnd *cmd, unsigned int good_bytes) } /* - * If we finished all bytes in the request we are done now. + * special case: failed zero length commands always need to + * drop down into the retry code. Otherwise, if we finished + * all bytes in the request we are done now. */ - if (!scsi_end_request(req, error, good_bytes, 0)) + if (!(blk_rq_bytes(req) == 0 && error) && + !scsi_end_request(req, error, good_bytes, 0)) return; /* |