aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorDan Carpenter <error27@gmail.com>2010-07-17 03:21:28 -0400
committerDavid S. Miller <davem@davemloft.net>2010-07-18 18:07:15 -0400
commit0a6efc78c0c22d60040da0dc98a0844e7c0d0647 (patch)
tree35239bcfbd1183deec54e7c9c43d2ec92da03e2e /drivers
parent8e64159dfb480b30233d947d5a3cd793dfea738f (diff)
arcnet: fix signed bug in probe function
probe_irq_off() returns the first irq found or if two irqs are found then it returns the negative of the first irq found. We can cast dev->irq to an int so that the test for negative values works. Signed-off-by: Dan Carpenter <error27@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/arcnet/com20020-isa.c4
-rw-r--r--drivers/net/arcnet/com90io.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/arcnet/com20020-isa.c b/drivers/net/arcnet/com20020-isa.c
index 0402da30a4e..37272827ee5 100644
--- a/drivers/net/arcnet/com20020-isa.c
+++ b/drivers/net/arcnet/com20020-isa.c
@@ -90,14 +90,14 @@ static int __init com20020isa_probe(struct net_device *dev)
90 outb(0, _INTMASK); 90 outb(0, _INTMASK);
91 dev->irq = probe_irq_off(airqmask); 91 dev->irq = probe_irq_off(airqmask);
92 92
93 if (dev->irq <= 0) { 93 if ((int)dev->irq <= 0) {
94 BUGMSG(D_INIT_REASONS, "Autoprobe IRQ failed first time\n"); 94 BUGMSG(D_INIT_REASONS, "Autoprobe IRQ failed first time\n");
95 airqmask = probe_irq_on(); 95 airqmask = probe_irq_on();
96 outb(NORXflag, _INTMASK); 96 outb(NORXflag, _INTMASK);
97 udelay(5); 97 udelay(5);
98 outb(0, _INTMASK); 98 outb(0, _INTMASK);
99 dev->irq = probe_irq_off(airqmask); 99 dev->irq = probe_irq_off(airqmask);
100 if (dev->irq <= 0) { 100 if ((int)dev->irq <= 0) {
101 BUGMSG(D_NORMAL, "Autoprobe IRQ failed.\n"); 101 BUGMSG(D_NORMAL, "Autoprobe IRQ failed.\n");
102 err = -ENODEV; 102 err = -ENODEV;
103 goto out; 103 goto out;
diff --git a/drivers/net/arcnet/com90io.c b/drivers/net/arcnet/com90io.c
index 4cb401813b7..eb27976dab3 100644
--- a/drivers/net/arcnet/com90io.c
+++ b/drivers/net/arcnet/com90io.c
@@ -213,7 +213,7 @@ static int __init com90io_probe(struct net_device *dev)
213 outb(0, _INTMASK); 213 outb(0, _INTMASK);
214 dev->irq = probe_irq_off(airqmask); 214 dev->irq = probe_irq_off(airqmask);
215 215
216 if (dev->irq <= 0) { 216 if ((int)dev->irq <= 0) {
217 BUGMSG(D_INIT_REASONS, "Autoprobe IRQ failed\n"); 217 BUGMSG(D_INIT_REASONS, "Autoprobe IRQ failed\n");
218 goto err_out; 218 goto err_out;
219 } 219 }