summaryrefslogtreecommitdiffstats
path: root/drivers/firewire
diff options
context:
space:
mode:
authorKristian Høgsberg2007-02-16 23:34:37 +0100
committerStefan Richter2007-03-09 22:02:57 +0100
commit6e2e8424d310507fa044649435114217826ed78a (patch)
tree7d1b8e802302c954dbd97842ef0adb7fa962a437 /drivers/firewire
parentfirewire: Read the *Clear versions of the iso interrupt register. (diff)
downloadkernel-qcow2-linux-6e2e8424d310507fa044649435114217826ed78a.tar.gz
kernel-qcow2-linux-6e2e8424d310507fa044649435114217826ed78a.tar.xz
kernel-qcow2-linux-6e2e8424d310507fa044649435114217826ed78a.zip
firewire: Use correct payload pointer when demarshalling incoming requests.
Signed-off-by: Kristian Høgsberg <krh@redhat.com> Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
Diffstat (limited to 'drivers/firewire')
-rw-r--r--drivers/firewire/fw-transaction.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/firewire/fw-transaction.c b/drivers/firewire/fw-transaction.c
index 5394569a1c89..abc37fa52492 100644
--- a/drivers/firewire/fw-transaction.c
+++ b/drivers/firewire/fw-transaction.c
@@ -575,7 +575,7 @@ allocate_request(struct fw_packet *p)
request->ack = p->ack;
request->length = length;
if (data)
- memcpy(request->data, p->payload, length);
+ memcpy(request->data, data, length);
memcpy(request->request_header, p->header, sizeof p->header);