diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-03-25 17:44:18 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-03-25 17:44:18 -0400 |
| commit | 54f53f2b94feb72622bec7a8563fc487d9f97720 (patch) | |
| tree | ab0c4e1dcadd25a00fa7a4febf41bc43b864cf73 /drivers/firewire/fw-transaction.h | |
| parent | f61fb8a52cdf8b9b6a6badde84aefe58cb35d315 (diff) | |
| parent | a4083c9271e0a697278e089f2c0b9a95363ada0a (diff) | |
Merge branch 'linux-2.6'
Diffstat (limited to 'drivers/firewire/fw-transaction.h')
| -rw-r--r-- | drivers/firewire/fw-transaction.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/firewire/fw-transaction.h b/drivers/firewire/fw-transaction.h index 09cb72870454..a43bb22912f9 100644 --- a/drivers/firewire/fw-transaction.h +++ b/drivers/firewire/fw-transaction.h | |||
| @@ -86,12 +86,12 @@ | |||
| 86 | static inline void | 86 | static inline void |
| 87 | fw_memcpy_from_be32(void *_dst, void *_src, size_t size) | 87 | fw_memcpy_from_be32(void *_dst, void *_src, size_t size) |
| 88 | { | 88 | { |
| 89 | u32 *dst = _dst; | 89 | u32 *dst = _dst; |
| 90 | u32 *src = _src; | 90 | __be32 *src = _src; |
| 91 | int i; | 91 | int i; |
| 92 | 92 | ||
| 93 | for (i = 0; i < size / 4; i++) | 93 | for (i = 0; i < size / 4; i++) |
| 94 | dst[i] = cpu_to_be32(src[i]); | 94 | dst[i] = be32_to_cpu(src[i]); |
| 95 | } | 95 | } |
| 96 | 96 | ||
| 97 | static inline void | 97 | static inline void |