aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/zd1211rw/zd_chip.h
diff options
context:
space:
mode:
authorDaniel Drake <dsd@gentoo.org>2007-04-03 23:17:37 +0100
committerJohn W. Linville <linville@tuxdriver.com>2007-04-10 14:35:56 -0400
commit92b3e2e9253a9f4c9224071842fd263c334dece0 (patch)
tree460e99558feb77f65ef285774480f4fbdd75e09b /drivers/net/wireless/zd1211rw/zd_chip.h
parentae6ead4623bfbc57f3945ff86f27e51811e2e91b (diff)
downloadkernel_samsung_smdk4412-92b3e2e9253a9f4c9224071842fd263c334dece0.zip
kernel_samsung_smdk4412-92b3e2e9253a9f4c9224071842fd263c334dece0.tar.gz
kernel_samsung_smdk4412-92b3e2e9253a9f4c9224071842fd263c334dece0.tar.bz2
[PATCH] zd1211rw: Fix E2P_PHY_REG patching
Due to conflicting/confusing defines in the vendor driver, we were reading E2P_PHY_REG from the wrong location. CR157 patching was slightly incorrect in that the vendor driver only patches in an 8-bit value, whereas we were patching 24 bits. Additionally, CR157 patching was happening on both zd1211 and zd1211b, but this should only happen on zd1211. Signed-off-by: Daniel Drake <dsd@gentoo.org> Signed-off-by: Ulrich Kunitz <kune@deine-taler.de> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/zd1211rw/zd_chip.h')
-rw-r--r--drivers/net/wireless/zd1211rw/zd_chip.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/zd1211rw/zd_chip.h b/drivers/net/wireless/zd1211rw/zd_chip.h
index ae39c22..e57ed75 100644
--- a/drivers/net/wireless/zd1211rw/zd_chip.h
+++ b/drivers/net/wireless/zd1211rw/zd_chip.h
@@ -641,8 +641,8 @@ enum {
* also only 11 channels. */
#define E2P_ALLOWED_CHANNEL E2P_DATA(0x18)
-#define E2P_PHY_REG E2P_DATA(0x1a)
#define E2P_DEVICE_VER E2P_DATA(0x20)
+#define E2P_PHY_REG E2P_DATA(0x25)
#define E2P_36M_CAL_VALUE1 E2P_DATA(0x28)
#define E2P_36M_CAL_VALUE2 E2P_DATA(0x2a)
#define E2P_36M_CAL_VALUE3 E2P_DATA(0x2c)