From 7b3817fc6bacb3f0506737b5a5643cb7b15717de Mon Sep 17 00:00:00 2001 From: Alan Stern Date: Mon, 15 Dec 2008 10:31:28 -0500 Subject: [PATCH] --- yaml --- r: 127874 b: refs/heads/master c: 3dbf6a54046052d79743822c9206af191e582ab0 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/scsi/scsi_lib.c | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index af781d59e986..640c1720052c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fa9907810bf733ef48b0cd50023b03b78f983434 +refs/heads/master: 3dbf6a54046052d79743822c9206af191e582ab0 diff --git a/trunk/drivers/scsi/scsi_lib.c b/trunk/drivers/scsi/scsi_lib.c index f2f51e0333eb..8c73bb4e0a2f 100644 --- a/trunk/drivers/scsi/scsi_lib.c +++ b/trunk/drivers/scsi/scsi_lib.c @@ -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)