---

yaml
---
r: 125143
b: refs/heads/master
c: b2cfb05
h: refs/heads/master
i:
  125141: 90cb0c8
  125139: 5a59220
  125135: 871db53
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2fb211502e2c0513e12d677ed4d7891f3c5e1413
+refs/heads/master: b2cfb05a701809abee591265a198afa029d68bff

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);