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

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>

diff --git a/drivers/net/irda/ali-ircc.c b/drivers/net/irda/ali-ircc.c
index 963067d3bda277b6acab90b838fa2d7b93c1ff7c..dcc80d652b78bea2dbc70a016f0914fe87ccd320 100644 (file)
--- 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 2d456dd164fb0e26a82e02d2c0142e1d2d4414c7..1a89fd459dd51110cc0a08931ad917f1e4850a8e 100644 (file)
--- 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 7d43506c70328cfc70801c9fa20050e2d5e683fd..f5bb92f15880dffb947f387577460451bb774068 100644 (file)
--- 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;
        }