From: Kristian Høgsberg <krh@redhat.com>
Date: Fri, 16 Feb 2007 22:34:37 +0000 (-0500)
Subject: firewire: Use correct payload pointer when demarshalling incoming requests.
X-Git-Tag: v2.6.22-rc1~111^2~89
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6e2e8424d310507fa044649435114217826ed78a;p=linux-2.6

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>
---

diff --git a/drivers/firewire/fw-transaction.c b/drivers/firewire/fw-transaction.c
index 5394569a1c..abc37fa524 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);