diff options
author | David S. Miller <davem@davemloft.net> | 2010-06-11 21:38:23 +0200 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-06-11 21:38:23 +0200 |
commit | e79aa8671033535c2e9ffc0a68010ae49ed5734c (patch) | |
tree | 237e16dd5d999f6ac2de89ae2a1d35ae0d4d74fd | |
parent | net8139: fix a race at the end of NAPI (diff) | |
parent | wimax/i2400m: fix missing endian correction read in fw loader (diff) | |
download | linux-e79aa8671033535c2e9ffc0a68010ae49ed5734c.tar.xz linux-e79aa8671033535c2e9ffc0a68010ae49ed5734c.zip |
Merge branch 'wimax-2.6.35.y' of git://git.kernel.org/pub/scm/linux/kernel/git/inaky/wimax
-rw-r--r-- | drivers/net/wimax/i2400m/fw.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wimax/i2400m/fw.c b/drivers/net/wimax/i2400m/fw.c index 3f283bff0ff7..11491354e5b5 100644 --- a/drivers/net/wimax/i2400m/fw.c +++ b/drivers/net/wimax/i2400m/fw.c @@ -1192,7 +1192,7 @@ int i2400m_fw_hdr_check(struct i2400m *i2400m, unsigned module_type, header_len, major_version, minor_version, module_id, module_vendor, date, size; - module_type = bcf_hdr->module_type; + module_type = le32_to_cpu(bcf_hdr->module_type); header_len = sizeof(u32) * le32_to_cpu(bcf_hdr->header_len); major_version = (le32_to_cpu(bcf_hdr->header_version) & 0xffff0000) >> 16; |