diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-12-02 15:44:03 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-12-02 15:44:03 -0500 |
| commit | d7a4858c0fde8383f7aa494eda0fba6bef3f2fec (patch) | |
| tree | 2cbf6915ea069ada4e3e1bca0b91b12e06500681 /drivers/net/wireless/rt2x00/rt2800lib.c | |
| parent | ba5736a5e9ac20c378ae4179e8a0ed3cc4b44351 (diff) | |
| parent | 9995ffe5f5fdddcc73e4465cc3f8b38714df8108 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Conflicts:
drivers/net/wireless/iwlwifi/iwl-agn.c
drivers/net/wireless/libertas/cfg.c
Diffstat (limited to 'drivers/net/wireless/rt2x00/rt2800lib.c')
| -rw-r--r-- | drivers/net/wireless/rt2x00/rt2800lib.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2800lib.c b/drivers/net/wireless/rt2x00/rt2800lib.c index 25dab2987131..e5df380d4fbe 100644 --- a/drivers/net/wireless/rt2x00/rt2800lib.c +++ b/drivers/net/wireless/rt2x00/rt2800lib.c | |||
| @@ -3773,7 +3773,7 @@ static void rt2800_efuse_read(struct rt2x00_dev *rt2x00dev, unsigned int i) | |||
| 3773 | /* Apparently the data is read from end to start */ | 3773 | /* Apparently the data is read from end to start */ |
| 3774 | rt2800_register_read_lock(rt2x00dev, EFUSE_DATA3, ®); | 3774 | rt2800_register_read_lock(rt2x00dev, EFUSE_DATA3, ®); |
| 3775 | /* The returned value is in CPU order, but eeprom is le */ | 3775 | /* The returned value is in CPU order, but eeprom is le */ |
| 3776 | rt2x00dev->eeprom[i] = cpu_to_le32(reg); | 3776 | *(u32 *)&rt2x00dev->eeprom[i] = cpu_to_le32(reg); |
| 3777 | rt2800_register_read_lock(rt2x00dev, EFUSE_DATA2, ®); | 3777 | rt2800_register_read_lock(rt2x00dev, EFUSE_DATA2, ®); |
| 3778 | *(u32 *)&rt2x00dev->eeprom[i + 2] = cpu_to_le32(reg); | 3778 | *(u32 *)&rt2x00dev->eeprom[i + 2] = cpu_to_le32(reg); |
| 3779 | rt2800_register_read_lock(rt2x00dev, EFUSE_DATA1, ®); | 3779 | rt2800_register_read_lock(rt2x00dev, EFUSE_DATA1, ®); |