projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
scsi
/
scsi_lib.c
diff --git
a/drivers/scsi/scsi_lib.c
b/drivers/scsi/scsi_lib.c
index 05d79af5ab90bfe76b58f1a77aab3eb215a83ec8..1f5a07bf2a7535e439300b4daa51f898983973ef 100644
(file)
--- a/
drivers/scsi/scsi_lib.c
+++ b/
drivers/scsi/scsi_lib.c
@@
-173,7
+173,7
@@
int scsi_queue_insert(struct scsi_cmnd *cmd, int reason)
* @retries: number of times to retry request
* @flags: or into request flags;
*
* @retries: number of times to retry request
* @flags: or into request flags;
*
- * returns the req->errors value which is the
the
scsi_cmnd result
+ * returns the req->errors value which is the scsi_cmnd result
* field.
**/
int scsi_execute(struct scsi_device *sdev, const unsigned char *cmd,
* field.
**/
int scsi_execute(struct scsi_device *sdev, const unsigned char *cmd,
@@
-848,8
+848,8
@@
void scsi_io_completion(struct scsi_cmnd *cmd, unsigned int good_bytes)
memcpy(req->sense, cmd->sense_buffer, len);
req->sense_len = len;
}
memcpy(req->sense, cmd->sense_buffer, len);
req->sense_len = len;
}
- }
else
-
req->data_len = cmd->resid;
+ }
+ req->data_len = cmd->resid;
}
/*
}
/*
@@
-968,9
+968,7
@@
void scsi_io_completion(struct scsi_cmnd *cmd, unsigned int good_bytes)
}
if (result) {
if (!(req->cmd_flags & REQ_QUIET)) {
}
if (result) {
if (!(req->cmd_flags & REQ_QUIET)) {
- scmd_printk(KERN_INFO, cmd,
- "SCSI error: return code = 0x%08x\n",
- result);
+ scsi_print_result(cmd);
if (driver_byte(result) & DRIVER_SENSE)
scsi_print_sense("", cmd);
}
if (driver_byte(result) & DRIVER_SENSE)
scsi_print_sense("", cmd);
}