diff options
| author | Julia Lawall <Julia.Lawall@lip6.fr> | 2012-03-11 11:49:02 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-03-11 15:41:18 -0700 |
| commit | a997cbb330689f476646330a9708725dd1523aba (patch) | |
| tree | 18ba4b684444cb891f06eda210c32ba4e58008ab /drivers/net/irda | |
| parent | 5eac5f6d3706cc075c543007ad1e70150faac7ba (diff) | |
| download | linux-3.10-a997cbb330689f476646330a9708725dd1523aba.tar.gz linux-3.10-a997cbb330689f476646330a9708725dd1523aba.tar.bz2 linux-3.10-a997cbb330689f476646330a9708725dd1523aba.zip | |
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/net/irda')
| -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 963067d3bda..dcc80d652b7 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) IRDA_WARNING("%s, unable to allocate dma=%d\n", ALI_IRCC_DRIVER_NAME, self->io.dma); - free_irq(self->io.irq, self); + free_irq(self->io.irq, dev); return -EAGAIN; } diff --git a/drivers/net/irda/via-ircc.c b/drivers/net/irda/via-ircc.c index 2d456dd164f..1a89fd459dd 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) if (request_dma(self->io.dma, dev->name)) { IRDA_WARNING("%s, unable to allocate dma=%d\n", driver_name, self->io.dma); - free_irq(self->io.irq, self); + free_irq(self->io.irq, dev); return -EAGAIN; } if (self->io.dma2 != self->io.dma) { if (request_dma(self->io.dma2, dev->name)) { IRDA_WARNING("%s, unable to allocate dma2=%d\n", driver_name, self->io.dma2); - free_irq(self->io.irq, self); + free_irq(self->io.irq, dev); free_dma(self->io.dma); return -EAGAIN; } diff --git a/drivers/net/irda/w83977af_ir.c b/drivers/net/irda/w83977af_ir.c index 7d43506c703..f5bb92f1588 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) * and clean up on failure. */ if (request_dma(self->io.dma, dev->name)) { - free_irq(self->io.irq, self); + free_irq(self->io.irq, dev); return -EAGAIN; } |