From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753189AbYL2TEQ (ORCPT ); Mon, 29 Dec 2008 14:04:16 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751867AbYL2TD5 (ORCPT ); Mon, 29 Dec 2008 14:03:57 -0500 Received: from mail-bw0-f21.google.com ([209.85.218.21]:54079 "EHLO mail-bw0-f21.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751677AbYL2TD4 (ORCPT ); Mon, 29 Dec 2008 14:03:56 -0500 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:date:message-id:subject; b=ZjiLSFLrrXlLKvGWsURNADQAYik0r/CX4EeYSxDMBLvrvx0p29Ag7UTZ5aE6S7hKas M2L8qXEK2yHAIVtC1OJqQbVvSdP3zNPmoXvN5rnvfRzV2yrcVDmqffqIX2SydZzbxidV xShTH1cfC7gYRER+SQnk1ZfJbC7zcG7hvKOoY= From: Bartlomiej Zolnierkiewicz To: linux-ide@vger.kernel.org Cc: Bartlomiej Zolnierkiewicz , linux-kernel@vger.kernel.org Date: Mon, 29 Dec 2008 20:04:15 +0100 Message-Id: <20081229190415.1020.43119.sendpatchset@localhost.localdomain> Subject: [PATCH 1/6] ide: make "paranoia" ->handler check in ide_intr() more strict Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Bartlomiej Zolnierkiewicz 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 --- 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;