From 9600dcf1347d304cf4dff34ef50569d6584b6968 Mon Sep 17 00:00:00 2001 From: Bartlomiej Zolnierkiewicz Date: Tue, 6 Jan 2009 17:20:58 +0100 Subject: ide: make "paranoia" ->handler check in ide_intr() more strict If ->handler is set while it shouldn't be it indicates deep problems so BUG_ON()-ning and preventing further damage is much more appropriate than merely printing an error message. Signed-off-by: Bartlomiej Zolnierkiewicz --- drivers/ide/ide-io.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'drivers') diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c index 9d363a1b5573..442904f0d626 100644 --- a/drivers/ide/ide-io.c +++ b/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; -- cgit v1.2.3