diff options
Diffstat (limited to 'drivers/net/wireless')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl3945-base.c | 4 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl4965-base.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c index 74b1099ff8aa..03a0756f7ef4 100644 --- a/drivers/net/wireless/iwlwifi/iwl3945-base.c +++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c | |||
@@ -1586,7 +1586,7 @@ static inline int iwl3945_eeprom_acquire_semaphore(struct iwl3945_priv *priv) | |||
1586 | */ | 1586 | */ |
1587 | int iwl3945_eeprom_init(struct iwl3945_priv *priv) | 1587 | int iwl3945_eeprom_init(struct iwl3945_priv *priv) |
1588 | { | 1588 | { |
1589 | __le16 *e = (__le16 *)&priv->eeprom; | 1589 | u16 *e = (u16 *)&priv->eeprom; |
1590 | u32 gp = iwl3945_read32(priv, CSR_EEPROM_GP); | 1590 | u32 gp = iwl3945_read32(priv, CSR_EEPROM_GP); |
1591 | u32 r; | 1591 | u32 r; |
1592 | int sz = sizeof(priv->eeprom); | 1592 | int sz = sizeof(priv->eeprom); |
@@ -1629,7 +1629,7 @@ int iwl3945_eeprom_init(struct iwl3945_priv *priv) | |||
1629 | IWL_ERROR("Time out reading EEPROM[%d]", addr); | 1629 | IWL_ERROR("Time out reading EEPROM[%d]", addr); |
1630 | return -ETIMEDOUT; | 1630 | return -ETIMEDOUT; |
1631 | } | 1631 | } |
1632 | e[addr / 2] = cpu_to_le16(r >> 16); | 1632 | e[addr / 2] = le16_to_cpu((__force __le16)(r >> 16)); |
1633 | } | 1633 | } |
1634 | 1634 | ||
1635 | return 0; | 1635 | return 0; |
diff --git a/drivers/net/wireless/iwlwifi/iwl4965-base.c b/drivers/net/wireless/iwlwifi/iwl4965-base.c index 14a11bd83e82..2c6756261856 100644 --- a/drivers/net/wireless/iwlwifi/iwl4965-base.c +++ b/drivers/net/wireless/iwlwifi/iwl4965-base.c | |||
@@ -1659,7 +1659,7 @@ static inline void iwl4965_eeprom_release_semaphore(struct iwl4965_priv *priv) | |||
1659 | */ | 1659 | */ |
1660 | int iwl4965_eeprom_init(struct iwl4965_priv *priv) | 1660 | int iwl4965_eeprom_init(struct iwl4965_priv *priv) |
1661 | { | 1661 | { |
1662 | __le16 *e = (__le16 *)&priv->eeprom; | 1662 | u16 *e = (u16 *)&priv->eeprom; |
1663 | u32 gp = iwl4965_read32(priv, CSR_EEPROM_GP); | 1663 | u32 gp = iwl4965_read32(priv, CSR_EEPROM_GP); |
1664 | u32 r; | 1664 | u32 r; |
1665 | int sz = sizeof(priv->eeprom); | 1665 | int sz = sizeof(priv->eeprom); |
@@ -1703,7 +1703,7 @@ int iwl4965_eeprom_init(struct iwl4965_priv *priv) | |||
1703 | rc = -ETIMEDOUT; | 1703 | rc = -ETIMEDOUT; |
1704 | goto done; | 1704 | goto done; |
1705 | } | 1705 | } |
1706 | e[addr / 2] = cpu_to_le16(r >> 16); | 1706 | e[addr / 2] = le16_to_cpu((__force __le16)(r >> 16)); |
1707 | } | 1707 | } |
1708 | rc = 0; | 1708 | rc = 0; |
1709 | 1709 | ||