diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2007-12-21 23:49:02 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-01-28 15:08:53 -0800 |
| commit | dc73c623dd0a653bf80ec41870dcf8b601fc6e9b (patch) | |
| tree | 09432cf8d477f0636e494e1758bdb01f6142b893 /drivers/net | |
| parent | e0c0056c677709bd1e2c18b84a1d10e54f7c8fcc (diff) | |
p54common annotations and fixes
* ->exp_id in bootrec_exp_if is __le16; missing conversion in its use
* !(x & y) misspelled as !x & y
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/wireless/p54common.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/wireless/p54common.c b/drivers/net/wireless/p54common.c index ad5c307a441..9660fdd873a 100644 --- a/drivers/net/wireless/p54common.c +++ b/drivers/net/wireless/p54common.c @@ -54,7 +54,7 @@ void p54_parse_firmware(struct ieee80211_hw *dev, const struct firmware *fw) u32 code = le32_to_cpu(bootrec->code); switch (code) { case BR_CODE_COMPONENT_ID: - switch (be32_to_cpu(*bootrec->data)) { + switch (be32_to_cpu(*(__be32 *)bootrec->data)) { case FW_FMAC: printk(KERN_INFO "p54: FreeMAC firmware\n"); break; @@ -78,14 +78,14 @@ void p54_parse_firmware(struct ieee80211_hw *dev, const struct firmware *fw) fw_version = (unsigned char*)bootrec->data; break; case BR_CODE_DESCR: - priv->rx_start = le32_to_cpu(bootrec->data[1]); + priv->rx_start = le32_to_cpu(((__le32 *)bootrec->data)[1]); /* FIXME add sanity checking */ - priv->rx_end = le32_to_cpu(bootrec->data[2]) - 0x3500; + priv->rx_end = le32_to_cpu(((__le32 *)bootrec->data)[2]) - 0x3500; break; case BR_CODE_EXPOSED_IF: exp_if = (struct bootrec_exp_if *) bootrec->data; for (i = 0; i < (len * sizeof(*exp_if) / 4); i++) - if (exp_if[i].if_id == 0x1a) + if (exp_if[i].if_id == cpu_to_le16(0x1a)) priv->fw_var = le16_to_cpu(exp_if[i].variant); break; case BR_CODE_DEPENDENT_IF: |