Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 62754878 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents c5750ee6 e97a294e

drivers/scsi/scsi.c

+1 −1
Original line number Diff line number Diff line
@@ -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)