From df1adab1cd863984a28164d7ce30909b43e76d1e Mon Sep 17 00:00:00 2001
From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Date: Fri, 2 Jan 2009 16:12:49 +0100
Subject: [PATCH] --- yaml --- r: 125143 b: refs/heads/master c:
 b2cfb05a701809abee591265a198afa029d68bff h: refs/heads/master i:   125141:
 90cb0c817fe9a60b828297bffea59e7ab8664e03   125139:
 5a59220aeed7d056b5a2c18cf8e3b7d66ef322e7   125135:
 871db53cf9ab553142592b13c5dd0b325d4b130b v: v3

---
 [refs]                     | 2 +-
 trunk/drivers/ide/ide-io.c | 9 +--------
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 73f7e91c2b2e..d946d204c8a6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2fb211502e2c0513e12d677ed4d7891f3c5e1413
+refs/heads/master: b2cfb05a701809abee591265a198afa029d68bff
diff --git a/trunk/drivers/ide/ide-io.c b/trunk/drivers/ide/ide-io.c
index 40327d1e6a9f..c60512196f61 100644
--- a/trunk/drivers/ide/ide-io.c
+++ b/trunk/drivers/ide/ide-io.c
@@ -1011,10 +1011,7 @@ void ide_timer_expiry (unsigned long data)
 		} else {
 			ide_hwif_t *hwif;
 			ide_startstop_t startstop = ide_stopped;
-			if (!hwgroup->busy) {
-				hwgroup->busy = 1;	/* paranoia */
-				printk(KERN_ERR "%s: ide_timer_expiry: hwgroup->busy was 0 ??\n", drive->name);
-			}
+
 			if ((expiry = hwgroup->expiry) != NULL) {
 				/* continue */
 				if ((wait = expiry(drive)) > 0) {
@@ -1227,10 +1224,6 @@ irqreturn_t ide_intr (int irq, void *dev_id)
 		 */
 		goto out;
 
-	if (!hwgroup->busy) {
-		hwgroup->busy = 1;	/* paranoia */
-		printk(KERN_ERR "%s: ide_intr: hwgroup->busy was 0 ??\n", drive->name);
-	}
 	hwgroup->handler = NULL;
 	hwgroup->req_gen++;
 	del_timer(&hwgroup->timer);