diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-11-22 22:46:55 +0100 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-11-22 22:46:55 +0100 |
| commit | 02f1ce35bed3ceb56868ec534591e15ffdcef879 (patch) | |
| tree | 49b72078598abe3542fb606a3af10dcb7f2d4f3f /drivers/net/wireless/rt2x00/rt2800lib.c | |
| parent | tc: comment spelling fixes (diff) | |
| parent | Revert "rt2800pci: handle spurious interrupts" (diff) | |
| download | linux-02f1ce35bed3ceb56868ec534591e15ffdcef879.tar.xz linux-02f1ce35bed3ceb56868ec534591e15ffdcef879.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
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 3f183a15186e..1ba079dffb11 100644 --- a/drivers/net/wireless/rt2x00/rt2800lib.c +++ b/drivers/net/wireless/rt2x00/rt2800lib.c @@ -3771,7 +3771,7 @@ static void rt2800_efuse_read(struct rt2x00_dev *rt2x00dev, unsigned int i) /* Apparently the data is read from end to start */ rt2800_register_read_lock(rt2x00dev, EFUSE_DATA3, ®); /* The returned value is in CPU order, but eeprom is le */ - rt2x00dev->eeprom[i] = cpu_to_le32(reg); + *(u32 *)&rt2x00dev->eeprom[i] = cpu_to_le32(reg); rt2800_register_read_lock(rt2x00dev, EFUSE_DATA2, ®); *(u32 *)&rt2x00dev->eeprom[i + 2] = cpu_to_le32(reg); rt2800_register_read_lock(rt2x00dev, EFUSE_DATA1, ®); |