[PATCH 1/3] pcmcia: m32r_pcc: check return from request_irq
Sudip Mukherjee
sudipm.mukherjee at gmail.com
Sun Sep 18 15:21:42 PDT 2016
While building m32r allmodconfig we were getting warning:
drivers/pcmcia/m32r_pcc.c:331:2:
warning: ignoring return value of 'request_irq',
declared with attribute warn_unused_result
request_irq() can fail and we should always be checking the result from
it. Check the result and return it to the caller.
Signed-off-by: Sudip Mukherjee <sudip.mukherjee at codethink.co.uk>
---
m32r allmodconfig build log is at:
https://travis-ci.org/sudipm-mukherjee/parport/jobs/160355863
drivers/pcmcia/m32r_pcc.c | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/drivers/pcmcia/m32r_pcc.c b/drivers/pcmcia/m32r_pcc.c
index eb126b9..fad4455 100644
--- a/drivers/pcmcia/m32r_pcc.c
+++ b/drivers/pcmcia/m32r_pcc.c
@@ -296,10 +296,11 @@ static int __init is_alive(u_short sock)
return 0;
}
-static void add_pcc_socket(ulong base, int irq, ulong mapaddr,
- unsigned int ioaddr)
+static int add_pcc_socket(ulong base, int irq, ulong mapaddr,
+ unsigned int ioaddr)
{
pcc_socket_t *t = &socket[pcc_sockets];
+ int err;
/* add sockets */
t->ioaddr = ioaddr;
@@ -328,11 +329,16 @@ static void add_pcc_socket(ulong base, int irq, ulong mapaddr,
t->socket.irq_mask = 0;
t->socket.pci_irq = 2 + pcc_sockets; /* XXX */
- request_irq(irq, pcc_interrupt, 0, "m32r-pcc", pcc_interrupt);
+ err = request_irq(irq, pcc_interrupt, 0, "m32r-pcc", pcc_interrupt);
+ if (err) {
+ if (t->base > 0)
+ release_region(t->base, 0x20);
+ return err;
+ }
pcc_sockets++;
- return;
+ return 0;
}
--
1.9.1
More information about the linux-pcmcia
mailing list