diff options
author | Russell King - ARM Linux <linux@arm.linux.org.uk> | 2009-11-28 00:13:23 +0000 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-11-29 23:47:14 -0800 |
commit | d5ccd67bb77ced5249067d05171992a7d5020393 (patch) | |
tree | 647c1354244a1a29816ed1c1d463d2f6db056600 /drivers/net/Space.c | |
parent | 6c53b1b15e222244358d3cbbefd2a13920faa352 (diff) |
NET: smc91x: Fix irq flags
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>
Diffstat (limited to 'drivers/net/Space.c')
0 files changed, 0 insertions, 0 deletions