aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/scsi_lib.c
diff options
context:
space:
mode:
authorAlan Stern <stern@rowland.harvard.edu>2008-12-15 10:31:28 -0500
committerJames Bottomley <James.Bottomley@HansenPartnership.com>2009-01-02 11:57:41 -0500
commit3dbf6a54046052d79743822c9206af191e582ab0 (patch)
tree15fd46062aa21ee2e1745c37de19267b90b0c689 /drivers/scsi/scsi_lib.c
parentfa9907810bf733ef48b0cd50023b03b78f983434 (diff)
[SCSI] Fix uninitialized variable error in scsi_io_completion
This patch (as1191) adds a missing "default" case in scsi_io_completion(), thereby fixing an "uninitialized variable" error. It also adds a missing newline to a log entry. Signed-off-by: Alan Stern <stern@rowland.harvard.edu> Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
Diffstat (limited to 'drivers/scsi/scsi_lib.c')
-rw-r--r--drivers/scsi/scsi_lib.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index f2f51e0333eb..8c73bb4e0a2f 100644
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -1029,6 +1029,10 @@ void scsi_io_completion(struct scsi_cmnd *cmd, unsigned int good_bytes)
1029 case 0x09: /* self test in progress */ 1029 case 0x09: /* self test in progress */
1030 action = ACTION_DELAYED_RETRY; 1030 action = ACTION_DELAYED_RETRY;
1031 break; 1031 break;
1032 default:
1033 description = "Device not ready";
1034 action = ACTION_FAIL;
1035 break;
1032 } 1036 }
1033 } else { 1037 } else {
1034 description = "Device not ready"; 1038 description = "Device not ready";
@@ -1054,7 +1058,7 @@ void scsi_io_completion(struct scsi_cmnd *cmd, unsigned int good_bytes)
1054 /* Give up and fail the remainder of the request */ 1058 /* Give up and fail the remainder of the request */
1055 if (!(req->cmd_flags & REQ_QUIET)) { 1059 if (!(req->cmd_flags & REQ_QUIET)) {
1056 if (description) 1060 if (description)
1057 scmd_printk(KERN_INFO, cmd, "%s", 1061 scmd_printk(KERN_INFO, cmd, "%s\n",
1058 description); 1062 description);
1059 scsi_print_result(cmd); 1063 scsi_print_result(cmd);
1060 if (driver_byte(result) & DRIVER_SENSE) 1064 if (driver_byte(result) & DRIVER_SENSE)