2 files changed, 5 insertions, 5 deletions

diff --git a/drivers/firewire/fw-transaction.c b/drivers/firewire/fw-transaction.c
index 1537737e4420..76938fe432a0 100644
--- a/drivers/firewire/fw-transaction.c
+++ b/drivers/firewire/fw-transaction.c
@@ -317,15 +317,15 @@ static void transaction_callback(struct fw_card *card, int rcode,
  */
 int fw_run_transaction(struct fw_card *card, int tcode, int destination_id,
                        int generation, int speed, unsigned long long offset,
-                       void *data, size_t length)
+                       void *payload, size_t length)
 {
         struct transaction_callback_data d;
         struct fw_transaction t;
 
         init_completion(&d.done);
-        d.payload = data;
+        d.payload = payload;
         fw_send_request(card, &t, tcode, destination_id, generation, speed,
-                        offset, data, length, transaction_callback, &d);
+                        offset, payload, length, transaction_callback, &d);
         wait_for_completion(&d.done);
 
         return d.rcode;
diff --git a/drivers/firewire/fw-transaction.h b/drivers/firewire/fw-transaction.h
index 212a10293828..35d0a4bb6d5c 100644
--- a/drivers/firewire/fw-transaction.h
+++ b/drivers/firewire/fw-transaction.h
@@ -405,14 +405,14 @@ int fw_core_initiate_bus_reset(struct fw_card *card, int short_reset);
 
 void fw_send_request(struct fw_card *card, struct fw_transaction *t,
                 int tcode, int destination_id, int generation, int speed,
-                unsigned long long offset, void *data, size_t length,
+                unsigned long long offset, void *payload, size_t length,
                 fw_transaction_callback_t callback, void *callback_data);
 int fw_cancel_transaction(struct fw_card *card,
                           struct fw_transaction *transaction);
 void fw_flush_transactions(struct fw_card *card);
 int fw_run_transaction(struct fw_card *card, int tcode, int destination_id,
                        int generation, int speed, unsigned long long offset,
-                       void *data, size_t length);
+                       void *payload, size_t length);
 void fw_send_phy_config(struct fw_card *card,
                         int node_id, int generation, int gap_count);