aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorZhu Yi <yi.zhu@intel.com>2006-02-17 08:25:12 +0800
committerJohn W. Linville <linville@tuxdriver.com>2006-03-17 15:08:03 -0500
commite8c69e27d14a5fb15df9967f8c8ec5978af33ba8 (patch)
treed428648e976c8844ff68a1328204af14ebb9d20a /drivers
parent[PATCH] ipw2200: Fix rf_kill is activated after mode change with 'disable=1' (diff)
downloadlinux-dev-e8c69e27d14a5fb15df9967f8c8ec5978af33ba8.tar.xz
linux-dev-e8c69e27d14a5fb15df9967f8c8ec5978af33ba8.zip
[PATCH] ipw2200: Fix ipw_sw_reset() implementation inconsistent with comment
Signed-off-by: Zhu Yi <yi.zhu@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/wireless/ipw2200.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/ipw2200.c b/drivers/net/wireless/ipw2200.c
index b80ebd37483e..e9804450ca6c 100644
--- a/drivers/net/wireless/ipw2200.c
+++ b/drivers/net/wireless/ipw2200.c
@@ -8064,7 +8064,7 @@ static int ipw_sw_reset(struct ipw_priv *priv, int option)
if ((priv->pci_dev->device == 0x4223) ||
(priv->pci_dev->device == 0x4224)) {
- if (option == 2)
+ if (option == 1)
printk(KERN_INFO DRV_NAME
": Detected Intel PRO/Wireless 2915ABG Network "
"Connection\n");
@@ -8075,7 +8075,7 @@ static int ipw_sw_reset(struct ipw_priv *priv, int option)
priv->adapter = IPW_2915ABG;
priv->ieee->mode = IEEE_A | IEEE_G | IEEE_B;
} else {
- if (option == 2)
+ if (option == 1)
printk(KERN_INFO DRV_NAME
": Detected Intel PRO/Wireless 2200BG Network "
"Connection\n");