summaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/davicom
diff options
context:
space:
mode:
authorAndrew Ruder <andrew.ruder@elecsyscorp.com>2014-06-05 00:28:44 +0200
committerDavid S. Miller <davem@davemloft.net>2014-06-06 00:12:10 +0200
commit6b50d038e7c668eb60b18c2fba8982a22e36527e (patch)
tree478d44b8899cbb179a65209281224bcd8ac5f853 /drivers/net/ethernet/davicom
parentMPLS: Use mpls_features to activate software MPLS GSO segmentation (diff)
downloadlinux-6b50d038e7c668eb60b18c2fba8982a22e36527e.tar.xz
linux-6b50d038e7c668eb60b18c2fba8982a22e36527e.zip
dm9000: acquire irq flags from device tree
The DM9000 supports both active high interrupts and active low interrupts. This is configured via the attached EEPROM. In the device-tree case, make sure that the DM9000 driver passes the correct flags to request_irq. Signed-off-by: Andrew Ruder <andrew.ruder@elecsyscorp.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/davicom')
-rw-r--r--drivers/net/ethernet/davicom/dm9000.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/ethernet/davicom/dm9000.c b/drivers/net/ethernet/davicom/dm9000.c
index 8c4b93be333b..1bdf69985c13 100644
--- a/drivers/net/ethernet/davicom/dm9000.c
+++ b/drivers/net/ethernet/davicom/dm9000.c
@@ -1292,6 +1292,9 @@ dm9000_open(struct net_device *dev)
* may work, and tell the user that this is a problem */
if (irqflags == IRQF_TRIGGER_NONE)
+ irqflags = irq_get_trigger_type(dev->irq);
+
+ if (irqflags == IRQF_TRIGGER_NONE)
dev_warn(db->dev, "WARNING: no IRQ resource flags set.\n");
irqflags |= IRQF_SHARED;