summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKristian Høgsberg <krh@redhat.com>2007-02-16 17:34:37 -0500
committerStefan Richter <stefanr@s5r6.in-berlin.de>2007-03-09 22:02:57 +0100
commit6e2e8424d310507fa044649435114217826ed78a (patch)
tree7d1b8e802302c954dbd97842ef0adb7fa962a437
parentc889475fb57bfe30091b42e58eb6b76edd355d45 (diff)
downloadblackbird-op-linux-6e2e8424d310507fa044649435114217826ed78a.tar.gz
blackbird-op-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>
-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);
OpenPOWER on IntegriCloud