From ae5cc219eec4f012b38f42cf04c81a23aa772dfe Mon Sep 17 00:00:00 2001
From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Date: Tue, 6 Jan 2009 17:20:58 +0100
Subject: [PATCH] --- yaml --- r: 126450 b: refs/heads/master c:
 9600dcf1347d304cf4dff34ef50569d6584b6968 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 25dd2b5bc5bd..05f5cc359de6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d6251d4488a361c93da2398818e1ec69cffb6073
+refs/heads/master: 9600dcf1347d304cf4dff34ef50569d6584b6968
diff --git a/trunk/drivers/ide/ide-io.c b/trunk/drivers/ide/ide-io.c
index 9d363a1b5573..442904f0d626 100644
--- a/trunk/drivers/ide/ide-io.c
+++ b/trunk/drivers/ide/ide-io.c
@@ -1159,12 +1159,9 @@ irqreturn_t ide_intr (int irq, void *dev_id)
 	 * won't allow another of the same (on any CPU) until we return.
 	 */
 	if (startstop == ide_stopped) {
-		if (hwif->handler == NULL) {	/* paranoia */
-			ide_unlock_port(hwif);
-			plug_device = 1;
-		} else
-			printk(KERN_ERR "%s: %s: huh? expected NULL handler "
-					"on exit\n", __func__, drive->name);
+		BUG_ON(hwif->handler);
+		ide_unlock_port(hwif);
+		plug_device = 1;
 	}
 out_handled:
 	irq_ret = IRQ_HANDLED;