From: Jiri Slaby Date: Tue, 8 May 2007 07:36:24 +0000 (-0700) Subject: Char: cyclades, allow DEBUG_SHIRQ X-Git-Tag: v2.6.22-rc1~491 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f1e83c6c1e7b97ac11d88502c3e5b80cdac9a683;p=linux-2.6 Char: cyclades, allow DEBUG_SHIRQ Test if base addr is non-null in ISR to prove the card has been correctly initialized. This is needed for DEBUG_SHIRQ for example. Signed-off-by: Jiri Slaby Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- diff --git a/drivers/char/cyclades.c b/drivers/char/cyclades.c index 353e888295..9d22d58f42 100644 --- a/drivers/char/cyclades.c +++ b/drivers/char/cyclades.c @@ -1444,6 +1444,10 @@ static irqreturn_t cyy_interrupt(int irq, void *dev_id) card_base_addr = cinfo->base_addr; index = cinfo->bus_index; + /* card was not initialized yet (e.g. DEBUG_SHIRQ) */ + if (unlikely(card_base_addr == NULL)) + return IRQ_HANDLED; + /* This loop checks all chips in the card. Make a note whenever _any_ chip had some work to do, as this is considered an indication that there will be more to do. Only when no chip