Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Julia Lawall and committed by
David S. Miller
a997cbb3 5eac5f6d

+4 -4
+1 -1
drivers/net/irda/ali-ircc.c
··· 1368 1368 IRDA_WARNING("%s, unable to allocate dma=%d\n", 1369 1369 ALI_IRCC_DRIVER_NAME, 1370 1370 self->io.dma); 1371 - free_irq(self->io.irq, self); 1371 + free_irq(self->io.irq, dev); 1372 1372 return -EAGAIN; 1373 1373 } 1374 1374
+2 -2
drivers/net/irda/via-ircc.c
··· 1495 1495 if (request_dma(self->io.dma, dev->name)) { 1496 1496 IRDA_WARNING("%s, unable to allocate dma=%d\n", driver_name, 1497 1497 self->io.dma); 1498 - free_irq(self->io.irq, self); 1498 + free_irq(self->io.irq, dev); 1499 1499 return -EAGAIN; 1500 1500 } 1501 1501 if (self->io.dma2 != self->io.dma) { 1502 1502 if (request_dma(self->io.dma2, dev->name)) { 1503 1503 IRDA_WARNING("%s, unable to allocate dma2=%d\n", 1504 1504 driver_name, self->io.dma2); 1505 - free_irq(self->io.irq, self); 1505 + free_irq(self->io.irq, dev); 1506 1506 free_dma(self->io.dma); 1507 1507 return -EAGAIN; 1508 1508 }
+1 -1
drivers/net/irda/w83977af_ir.c
··· 1172 1172 * and clean up on failure. 1173 1173 */ 1174 1174 if (request_dma(self->io.dma, dev->name)) { 1175 - free_irq(self->io.irq, self); 1175 + free_irq(self->io.irq, dev); 1176 1176 return -EAGAIN; 1177 1177 } 1178 1178