Commit a997cbb3 authored by Julia Lawall's avatar Julia Lawall Committed by David S. Miller

drivers/net/irda/{ali-ircc, via-ircc, w83977af-ir}.c: ensure arguments to...

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: default avatarJulia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5eac5f6d
...@@ -1368,7 +1368,7 @@ static int ali_ircc_net_open(struct net_device *dev) ...@@ -1368,7 +1368,7 @@ static int ali_ircc_net_open(struct net_device *dev)
IRDA_WARNING("%s, unable to allocate dma=%d\n", IRDA_WARNING("%s, unable to allocate dma=%d\n",
ALI_IRCC_DRIVER_NAME, ALI_IRCC_DRIVER_NAME,
self->io.dma); self->io.dma);
free_irq(self->io.irq, self); free_irq(self->io.irq, dev);
return -EAGAIN; return -EAGAIN;
} }
......
...@@ -1495,14 +1495,14 @@ static int via_ircc_net_open(struct net_device *dev) ...@@ -1495,14 +1495,14 @@ static int via_ircc_net_open(struct net_device *dev)
if (request_dma(self->io.dma, dev->name)) { if (request_dma(self->io.dma, dev->name)) {
IRDA_WARNING("%s, unable to allocate dma=%d\n", driver_name, IRDA_WARNING("%s, unable to allocate dma=%d\n", driver_name,
self->io.dma); self->io.dma);
free_irq(self->io.irq, self); free_irq(self->io.irq, dev);
return -EAGAIN; return -EAGAIN;
} }
if (self->io.dma2 != self->io.dma) { if (self->io.dma2 != self->io.dma) {
if (request_dma(self->io.dma2, dev->name)) { if (request_dma(self->io.dma2, dev->name)) {
IRDA_WARNING("%s, unable to allocate dma2=%d\n", IRDA_WARNING("%s, unable to allocate dma2=%d\n",
driver_name, self->io.dma2); driver_name, self->io.dma2);
free_irq(self->io.irq, self); free_irq(self->io.irq, dev);
free_dma(self->io.dma); free_dma(self->io.dma);
return -EAGAIN; return -EAGAIN;
} }
......
...@@ -1172,7 +1172,7 @@ static int w83977af_net_open(struct net_device *dev) ...@@ -1172,7 +1172,7 @@ static int w83977af_net_open(struct net_device *dev)
* and clean up on failure. * and clean up on failure.
*/ */
if (request_dma(self->io.dma, dev->name)) { if (request_dma(self->io.dma, dev->name)) {
free_irq(self->io.irq, self); free_irq(self->io.irq, dev);
return -EAGAIN; return -EAGAIN;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment