diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-03-04 11:37:36 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-03-04 11:37:36 -0800 |
| commit | 6275487806fbc17e92595b5880d7b0ee49363c4f (patch) | |
| tree | 3542672eacd8c413b20f9c47c8b65db537e251e6 /drivers | |
| parent | c5750ee69f469024d98019545e41c74abf1652bd (diff) | |
| parent | e97a294ef6938512b655b1abf17656cf2b26f709 (diff) | |
| download | kernel-crypto-6275487806fbc17e92595b5880d7b0ee49363c4f.tar.gz kernel-crypto-6275487806fbc17e92595b5880d7b0ee49363c4f.tar.xz kernel-crypto-6275487806fbc17e92595b5880d7b0ee49363c4f.zip | |
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
scsi: missing add of padded bytes to io completion byte count
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/scsi/scsi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c index fecba05b4e7..e5c6f6af876 100644 --- a/drivers/scsi/scsi.c +++ b/drivers/scsi/scsi.c @@ -757,7 +757,7 @@ void scsi_finish_command(struct scsi_cmnd *cmd) "Notifying upper driver of completion " "(result %x)\n", cmd->result)); - good_bytes = scsi_bufflen(cmd); + good_bytes = scsi_bufflen(cmd) + cmd->request->extra_len; if (cmd->request->cmd_type != REQ_TYPE_BLOCK_PC) { drv = scsi_cmd_to_driver(cmd); if (drv->done) |