diff options
-rw-r--r-- | drivers/firewire/fw-cdev.c | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/drivers/firewire/fw-cdev.c b/drivers/firewire/fw-cdev.c index 06471302200f..b960fd996918 100644 --- a/drivers/firewire/fw-cdev.c +++ b/drivers/firewire/fw-cdev.c | |||
@@ -621,20 +621,19 @@ iso_callback(struct fw_iso_context *context, u32 cycle, | |||
621 | size_t header_length, void *header, void *data) | 621 | size_t header_length, void *header, void *data) |
622 | { | 622 | { |
623 | struct client *client = data; | 623 | struct client *client = data; |
624 | struct iso_interrupt *interrupt; | 624 | struct iso_interrupt *irq; |
625 | 625 | ||
626 | interrupt = kzalloc(sizeof(*interrupt) + header_length, GFP_ATOMIC); | 626 | irq = kzalloc(sizeof(*irq) + header_length, GFP_ATOMIC); |
627 | if (interrupt == NULL) | 627 | if (irq == NULL) |
628 | return; | 628 | return; |
629 | 629 | ||
630 | interrupt->interrupt.type = FW_CDEV_EVENT_ISO_INTERRUPT; | 630 | irq->interrupt.type = FW_CDEV_EVENT_ISO_INTERRUPT; |
631 | interrupt->interrupt.closure = client->iso_closure; | 631 | irq->interrupt.closure = client->iso_closure; |
632 | interrupt->interrupt.cycle = cycle; | 632 | irq->interrupt.cycle = cycle; |
633 | interrupt->interrupt.header_length = header_length; | 633 | irq->interrupt.header_length = header_length; |
634 | memcpy(interrupt->interrupt.header, header, header_length); | 634 | memcpy(irq->interrupt.header, header, header_length); |
635 | queue_event(client, &interrupt->event, | 635 | queue_event(client, &irq->event, &irq->interrupt, |
636 | &interrupt->interrupt, | 636 | sizeof(irq->interrupt) + header_length, NULL, 0); |
637 | sizeof(interrupt->interrupt) + header_length, NULL, 0); | ||
638 | } | 637 | } |
639 | 638 | ||
640 | static int ioctl_create_iso_context(struct client *client, void *buffer) | 639 | static int ioctl_create_iso_context(struct client *client, void *buffer) |