summaryrefslogtreecommitdiffstats
path: root/drivers/firewire/fw-transaction.c
diff options
context:
space:
mode:
authorPaul Mackerras2008-12-16 04:38:58 +0100
committerPaul Mackerras2008-12-16 04:38:58 +0100
commit1e1c568d6c66d1e2e345fd15e2a1ceafc5d7e33a (patch)
tree0cf88547108a750d6eb910564ef5bf0ffb5ceef3 /drivers/firewire/fw-transaction.c
parentpowerpc/85xx: Fix compile issues with mpc8572ds.dts (diff)
parentpowerpc/cell/axon-msi: Fix MSI after kexec (diff)
downloadkernel-qcow2-linux-1e1c568d6c66d1e2e345fd15e2a1ceafc5d7e33a.tar.gz
kernel-qcow2-linux-1e1c568d6c66d1e2e345fd15e2a1ceafc5d7e33a.tar.xz
kernel-qcow2-linux-1e1c568d6c66d1e2e345fd15e2a1ceafc5d7e33a.zip
Merge branch 'merge' into next
Diffstat (limited to 'drivers/firewire/fw-transaction.c')
-rw-r--r--drivers/firewire/fw-transaction.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/firewire/fw-transaction.c b/drivers/firewire/fw-transaction.c
index 022ac4fabb67..2884f876397b 100644
--- a/drivers/firewire/fw-transaction.c
+++ b/drivers/firewire/fw-transaction.c
@@ -207,6 +207,7 @@ fw_fill_request(struct fw_packet *packet, int tcode, int tlabel,
packet->speed = speed;
packet->generation = generation;
packet->ack = 0;
+ packet->payload_bus = 0;
}
/**
@@ -581,6 +582,8 @@ fw_fill_response(struct fw_packet *response, u32 *request_header,
BUG();
return;
}
+
+ response->payload_bus = 0;
}
EXPORT_SYMBOL(fw_fill_response);