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

Commit 930e4b7f authored by Stefan Richter's avatar Stefan Richter
Browse files

firewire: fw-core: local variable shadows a global one 



Sparse warned about it although it was apparently harmless:

drivers/firewire/fw-cdev.c:624:23: warning: symbol 'interrupt' shadows an earlier one
include/asm/hw_irq.h:29:13: originally declared here

Signed-off-by: default avatarStefan Richter <stefanr@s5r6.in-berlin.de>
parent 1415d918

drivers/firewire/fw-cdev.c

+10 −11
Original line number Original line Diff line number Diff line
@@ -621,20 +621,19 @@ iso_callback(struct fw_iso_context *context, u32 cycle, 
	     size_t header_length, void *header, void *data)

	     size_t header_length, void *header, void *data)

{

{

	struct client *client = data;

	struct client *client = data;

	struct iso_interrupt *interrupt;

	struct iso_interrupt *irq;





	interrupt = kzalloc(sizeof(*interrupt) + header_length, GFP_ATOMIC);

	irq = kzalloc(sizeof(*irq) + header_length, GFP_ATOMIC);

	if (interrupt == NULL)

	if (irq == NULL)

		return;

		return;





	interrupt->interrupt.type      = FW_CDEV_EVENT_ISO_INTERRUPT;

	irq->interrupt.type      = FW_CDEV_EVENT_ISO_INTERRUPT;

	interrupt->interrupt.closure   = client->iso_closure;

	irq->interrupt.closure   = client->iso_closure;

	interrupt->interrupt.cycle     = cycle;

	irq->interrupt.cycle     = cycle;

	interrupt->interrupt.header_length = header_length;

	irq->interrupt.header_length = header_length;

	memcpy(interrupt->interrupt.header, header, header_length);

	memcpy(irq->interrupt.header, header, header_length);

	queue_event(client, &interrupt->event,

	queue_event(client, &irq->event, &irq->interrupt,

		    &interrupt->interrupt,

		    sizeof(irq->interrupt) + header_length, NULL, 0);

		    sizeof(interrupt->interrupt) + header_length, NULL, 0);

}

}





static int ioctl_create_iso_context(struct client *client, void *buffer)

static int ioctl_create_iso_context(struct client *client, void *buffer)