NET: smc91x: Fix irq flags
commit3681f3e31bbe46da8c7fd3490f41e0abe93c0084
authorRussell King - ARM Linux <linux@arm.linux.org.uk>
Sat, 28 Nov 2009 00:13:23 +0000 (28 00:13 +0000)
committerGreg Kroah-Hartman <gregkh@suse.de>
Fri, 18 Dec 2009 21:43:56 +0000 (18 13:43 -0800)
tree713c0420c18a41f70e638b4bb991bf606ab1a54e
parentd65e5e58537d8b09972ac37974d40d0ef7cec019
NET: smc91x: Fix irq flags

[ Upstream commit d5ccd67bb77ced5249067d05171992a7d5020393 ]

smc91x.h defines SMC_IRQ_FLAGS to be -1 when it wants the interrupt
flags to be taken from the resource structure.  However, d280ead
changed this to checking for non-zero resource flags.

Unfortunately, this means that on some platforms, we end up passing
'-1' to request_irq rather than the desired result.  Combine the two
conditions into one so that the IRQ flags are taken from the resource
if either SMC_IRQ_FLAGS is -1 or the resource flags specify an
interrupt trigger.

This restores network on at least the Versatile platform.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Acked-by: Eric Miao <eric.y.miao@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/net/smc91x.c