]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
drivers/pcmcia/m32r_pcc.c: check return from request_irq
authorSudip Mukherjee <sudipm.mukherjee@gmail.com>
Tue, 13 Dec 2016 00:40:59 +0000 (16:40 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 13 Dec 2016 02:55:06 +0000 (18:55 -0800)
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.

Link: http://lkml.kernel.org/r/1474237304-897-1-git-send-email-sudipm.mukherjee@gmail.com
Signed-off-by: Sudip Mukherjee <sudip.mukherjee@codethink.co.uk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
drivers/pcmcia/m32r_pcc.c

index eb126b98ed8a3d42cf83566c30c53546896f4c54..fad4455665eb482e5869acbcece2988ed83c8af5 100644 (file)
@@ -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;
 }