]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[SCSI] Fix uninitialized variable error in scsi_io_completion
authorAlan Stern <stern@rowland.harvard.edu>
Mon, 15 Dec 2008 15:31:28 +0000 (10:31 -0500)
committerJames Bottomley <James.Bottomley@HansenPartnership.com>
Fri, 2 Jan 2009 16:57:41 +0000 (10:57 -0600)
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>
drivers/scsi/scsi_lib.c

index f2f51e0333eb3b8c8cd1b30fcffe22dd92a03284..8c73bb4e0a2f910f4d1f2cec0b6c5de80cdd956f 100644 (file)
@@ -1029,6 +1029,10 @@ void scsi_io_completion(struct scsi_cmnd *cmd, unsigned int good_bytes)
                                case 0x09: /* self test in progress */
                                        action = ACTION_DELAYED_RETRY;
                                        break;
+                               default:
+                                       description = "Device not ready";
+                                       action = ACTION_FAIL;
+                                       break;
                                }
                        } else {
                                description = "Device not ready";
@@ -1054,7 +1058,7 @@ void scsi_io_completion(struct scsi_cmnd *cmd, unsigned int good_bytes)
                /* Give up and fail the remainder of the request */
                if (!(req->cmd_flags & REQ_QUIET)) {
                        if (description)
-                               scmd_printk(KERN_INFO, cmd, "%s",
+                               scmd_printk(KERN_INFO, cmd, "%s\n",
                                            description);
                        scsi_print_result(cmd);
                        if (driver_byte(result) & DRIVER_SENSE)