From: Bartlomiej Zolnierkiewicz <bzolnier@xxxxxxxxx> Subject: [PATCH] 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 <bzolnier@xxxxxxxxx> --- trivia for pata-2.6 tree drivers/ide/ide-io.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) Index: b/drivers/ide/ide-io.c =================================================================== --- a/drivers/ide/ide-io.c +++ b/drivers/ide/ide-io.c @@ -1159,12 +1159,9 @@ irqreturn_t ide_intr (int irq, void *dev * 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; -- To unsubscribe from this list: send the line "unsubscribe linux-ide" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html