diff options
Diffstat (limited to 'drivers/net/wireless/adm8211.c')
| -rw-r--r-- | drivers/net/wireless/adm8211.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/wireless/adm8211.c b/drivers/net/wireless/adm8211.c index 5bf7913aadda..14d90a9409aa 100644 --- a/drivers/net/wireless/adm8211.c +++ b/drivers/net/wireless/adm8211.c | |||
| @@ -104,7 +104,7 @@ static int adm8211_read_eeprom(struct ieee80211_hw *dev) | |||
| 104 | if (!priv->eeprom) | 104 | if (!priv->eeprom) |
| 105 | return -ENOMEM; | 105 | return -ENOMEM; |
| 106 | 106 | ||
| 107 | eeprom_93cx6_multiread(&eeprom, 0, (__le16 __force *)priv->eeprom, words); | 107 | eeprom_93cx6_multiread(&eeprom, 0, (__le16 *)priv->eeprom, words); |
| 108 | 108 | ||
| 109 | cr49 = le16_to_cpu(priv->eeprom->cr49); | 109 | cr49 = le16_to_cpu(priv->eeprom->cr49); |
| 110 | priv->rf_type = (cr49 >> 3) & 0x7; | 110 | priv->rf_type = (cr49 >> 3) & 0x7; |
| @@ -1867,9 +1867,9 @@ static int __devinit adm8211_probe(struct pci_dev *pdev, | |||
| 1867 | goto err_iounmap; | 1867 | goto err_iounmap; |
| 1868 | } | 1868 | } |
| 1869 | 1869 | ||
| 1870 | *(u32 *)perm_addr = le32_to_cpu((__force __le32)ADM8211_CSR_READ(PAR0)); | 1870 | *(__le32 *)perm_addr = cpu_to_le32(ADM8211_CSR_READ(PAR0)); |
| 1871 | *(u16 *)&perm_addr[4] = | 1871 | *(__le16 *)&perm_addr[4] = |
| 1872 | le16_to_cpu((__force __le16)ADM8211_CSR_READ(PAR1) & 0xFFFF); | 1872 | cpu_to_le16(ADM8211_CSR_READ(PAR1) & 0xFFFF); |
| 1873 | 1873 | ||
| 1874 | if (!is_valid_ether_addr(perm_addr)) { | 1874 | if (!is_valid_ether_addr(perm_addr)) { |
| 1875 | printk(KERN_WARNING "%s (adm8211): Invalid hwaddr in EEPROM!\n", | 1875 | printk(KERN_WARNING "%s (adm8211): Invalid hwaddr in EEPROM!\n", |