From 1650647968498893fa92cf4e682e68105fdf8e4c Mon Sep 17 00:00:00 2001
From: Stefan Richter <stefanr@s5r6.in-berlin.de>
Date: Tue, 10 Mar 2009 21:01:54 +0100
Subject: [PATCH] --- yaml --- r: 136027 b: refs/heads/master c:
 664d8010b170ae8b3ce9268b4f4da934d27b0491 h: refs/heads/master i:   136025:
 39feb71ce0cdc217031bbf62c73022b69c9b42c4   136023:
 d69ba83031ab138488750c920b1b6443c8247a22 v: v3

---
 [refs]                           |  2 +-
 trunk/drivers/firewire/fw-cdev.c | 12 ++++--------
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 76d2beebd0d1..1a5d0d3ab6ab 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 207fbefb18de9bc6f871e4008da29879c90cb67e
+refs/heads/master: 664d8010b170ae8b3ce9268b4f4da934d27b0491
diff --git a/trunk/drivers/firewire/fw-cdev.c b/trunk/drivers/firewire/fw-cdev.c
index c54e019c9586..95a207545eb3 100644
--- a/trunk/drivers/firewire/fw-cdev.c
+++ b/trunk/drivers/firewire/fw-cdev.c
@@ -549,15 +549,11 @@ static int init_request(struct client *client,
 	client_get(client);
 
 	fw_send_request(client->device->card, &e->r.transaction,
-			request->tcode & 0x1f, destination_id,
-			request->generation, speed, request->offset,
-			e->response.data, request->length,
-			complete_transaction, e);
+			request->tcode, destination_id, request->generation,
+			speed, request->offset, e->response.data,
+			request->length, complete_transaction, e);
+	return 0;
 
-	if (request->data)
-		return sizeof(request) + request->length;
-	else
-		return sizeof(request);
  failed:
 	kfree(e);