diff --git a/drivers/firewire/fw-cdev.c b/drivers/firewire/fw-cdev.c
index c54e019c95860561b03b982145ce01e19a2c2287..95a207545eb3022c033af78a6ed2058979b89ecc 100644
--- a/drivers/firewire/fw-cdev.c
+++ b/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);