Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4170a20f authored by Sudip Mukherjee's avatar Sudip Mukherjee Committed by Linus Torvalds
Browse files

drivers/pcmcia/m32r_pcc.c: check return from request_irq

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: default avatarSudip Mukherjee <sudip.mukherjee@codethink.co.uk>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 17e96230
Loading
Loading
Loading
Loading
+10 −4
Original line number Diff line number Diff line
@@ -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,
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;
}