diff options
author | Julia Lawall <Julia.Lawall@lip6.fr> | 2012-03-11 07:49:02 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-03-11 18:41:18 -0400 |
commit | a997cbb330689f476646330a9708725dd1523aba (patch) | |
tree | 18ba4b684444cb891f06eda210c32ba4e58008ab /drivers | |
parent | 5eac5f6d3706cc075c543007ad1e70150faac7ba (diff) |
drivers/net/irda/{ali-ircc, via-ircc, w83977af-ir}.c: ensure arguments to request_irq and free_irq are compatible
Convert calls to free_irq so that the second argument is the same as the
last argument of the corresponding call to request_irq. Without this
property, free_irq does nothing.
Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/irda/ali-ircc.c | 2 | ||||
-rw-r--r-- | drivers/net/irda/via-ircc.c | 4 | ||||
-rw-r--r-- | drivers/net/irda/w83977af_ir.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/irda/ali-ircc.c b/drivers/net/irda/ali-ircc.c index 963067d3bda2..dcc80d652b78 100644 --- a/drivers/net/irda/ali-ircc.c +++ b/drivers/net/irda/ali-ircc.c | |||
@@ -1368,7 +1368,7 @@ static int ali_ircc_net_open(struct net_device *dev) | |||
1368 | IRDA_WARNING("%s, unable to allocate dma=%d\n", | 1368 | IRDA_WARNING("%s, unable to allocate dma=%d\n", |
1369 | ALI_IRCC_DRIVER_NAME, | 1369 | ALI_IRCC_DRIVER_NAME, |
1370 | self->io.dma); | 1370 | self->io.dma); |
1371 | free_irq(self->io.irq, self); | 1371 | free_irq(self->io.irq, dev); |
1372 | return -EAGAIN; | 1372 | return -EAGAIN; |
1373 | } | 1373 | } |
1374 | 1374 | ||
diff --git a/drivers/net/irda/via-ircc.c b/drivers/net/irda/via-ircc.c index 2d456dd164fb..1a89fd459dd5 100644 --- a/drivers/net/irda/via-ircc.c +++ b/drivers/net/irda/via-ircc.c | |||
@@ -1495,14 +1495,14 @@ static int via_ircc_net_open(struct net_device *dev) | |||
1495 | if (request_dma(self->io.dma, dev->name)) { | 1495 | if (request_dma(self->io.dma, dev->name)) { |
1496 | IRDA_WARNING("%s, unable to allocate dma=%d\n", driver_name, | 1496 | IRDA_WARNING("%s, unable to allocate dma=%d\n", driver_name, |
1497 | self->io.dma); | 1497 | self->io.dma); |
1498 | free_irq(self->io.irq, self); | 1498 | free_irq(self->io.irq, dev); |
1499 | return -EAGAIN; | 1499 | return -EAGAIN; |
1500 | } | 1500 | } |
1501 | if (self->io.dma2 != self->io.dma) { | 1501 | if (self->io.dma2 != self->io.dma) { |
1502 | if (request_dma(self->io.dma2, dev->name)) { | 1502 | if (request_dma(self->io.dma2, dev->name)) { |
1503 | IRDA_WARNING("%s, unable to allocate dma2=%d\n", | 1503 | IRDA_WARNING("%s, unable to allocate dma2=%d\n", |
1504 | driver_name, self->io.dma2); | 1504 | driver_name, self->io.dma2); |
1505 | free_irq(self->io.irq, self); | 1505 | free_irq(self->io.irq, dev); |
1506 | free_dma(self->io.dma); | 1506 | free_dma(self->io.dma); |
1507 | return -EAGAIN; | 1507 | return -EAGAIN; |
1508 | } | 1508 | } |
diff --git a/drivers/net/irda/w83977af_ir.c b/drivers/net/irda/w83977af_ir.c index 7d43506c7032..f5bb92f15880 100644 --- a/drivers/net/irda/w83977af_ir.c +++ b/drivers/net/irda/w83977af_ir.c | |||
@@ -1172,7 +1172,7 @@ static int w83977af_net_open(struct net_device *dev) | |||
1172 | * and clean up on failure. | 1172 | * and clean up on failure. |
1173 | */ | 1173 | */ |
1174 | if (request_dma(self->io.dma, dev->name)) { | 1174 | if (request_dma(self->io.dma, dev->name)) { |
1175 | free_irq(self->io.irq, self); | 1175 | free_irq(self->io.irq, dev); |
1176 | return -EAGAIN; | 1176 | return -EAGAIN; |
1177 | } | 1177 | } |
1178 | 1178 | ||