From b4e1202c32f25ea26ac03b4f20c3dcbcff1855e3 Mon Sep 17 00:00:00 2001
From: Jens Axboe <axboe@suse.de>
Date: Fri, 28 Jul 2006 09:04:09 +0200
Subject: [PATCH] --- yaml --- r: 32849 b: refs/heads/master c:
 a75ad3c27a6ad78c4306cac939938050dcde54f3 h: refs/heads/master i:   32847:
 7b8edac79caad69a1337f047ca150ff835be9f1e v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/scsi/scsi_ioctl.c | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index a7d5a5b34c2b..f9a11d732951 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 71ef51cc1756d1c56b57c70e7cc27a3559c81ee6
+refs/heads/master: a75ad3c27a6ad78c4306cac939938050dcde54f3
diff --git a/trunk/drivers/scsi/scsi_ioctl.c b/trunk/drivers/scsi/scsi_ioctl.c
index a89c4115cfba..32293f451669 100644
--- a/trunk/drivers/scsi/scsi_ioctl.c
+++ b/trunk/drivers/scsi/scsi_ioctl.c
@@ -110,11 +110,8 @@ static int ioctl_internal_command(struct scsi_device *sdev, char *cmd,
 				       sshdr.asc, sshdr.ascq);
 			break;
 		case NOT_READY:	/* This happens if there is no disc in drive */
-			if (sdev->removable && (cmd[0] != TEST_UNIT_READY)) {
-				printk(KERN_INFO "Device not ready. Make sure"
-				       " there is a disc in the drive.\n");
+			if (sdev->removable)
 				break;
-			}
 		case UNIT_ATTENTION:
 			if (sdev->removable) {
 				sdev->changed = 1;