diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-28 09:07:54 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-28 09:07:54 -0400 |
| commit | a403e45c3b678211ee3b7225dbb924921fb5ddd3 (patch) | |
| tree | 6526d8d3c46f2443c7836bf094366179a57e7aad /drivers/firewire/fw-cdev.c | |
| parent | a05d2ebab28011c2f3f520833f4bfdd2fd1b9c02 (diff) | |
| parent | d974ae379a2fbe8948f01eabbc6b19c0a80f09bc (diff) | |
Merge core/lib: pick up memparse() change.
Merge branch 'core/lib' into x86/xen
Diffstat (limited to 'drivers/firewire/fw-cdev.c')
| -rw-r--r-- | drivers/firewire/fw-cdev.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/firewire/fw-cdev.c b/drivers/firewire/fw-cdev.c index c639915fc3cb..bc81d6fcd2fd 100644 --- a/drivers/firewire/fw-cdev.c +++ b/drivers/firewire/fw-cdev.c | |||
| @@ -382,9 +382,9 @@ complete_transaction(struct fw_card *card, int rcode, | |||
| 382 | 382 | ||
| 383 | response->response.type = FW_CDEV_EVENT_RESPONSE; | 383 | response->response.type = FW_CDEV_EVENT_RESPONSE; |
| 384 | response->response.rcode = rcode; | 384 | response->response.rcode = rcode; |
| 385 | queue_event(client, &response->event, | 385 | queue_event(client, &response->event, &response->response, |
| 386 | &response->response, sizeof(response->response), | 386 | sizeof(response->response) + response->response.length, |
| 387 | response->response.data, response->response.length); | 387 | NULL, 0); |
| 388 | } | 388 | } |
| 389 | 389 | ||
| 390 | static int ioctl_send_request(struct client *client, void *buffer) | 390 | static int ioctl_send_request(struct client *client, void *buffer) |