From 8480d993624ca76787ccf4163a340f91657127f6 Mon Sep 17 00:00:00 2001
From: Larry Finger <Larry.Finger@lwfinger.net>
Date: Fri, 31 Oct 2008 09:52:07 -0700
Subject: [PATCH] --- yaml --- r: 121790 b: refs/heads/master c:
 2f20596b50ee964715f9ad44d848802f0baba5d8 h: refs/heads/master v: v3

---
 [refs]                                       | 2 +-
 trunk/drivers/net/wireless/rtl8187_dev.c     | 2 +-
 trunk/drivers/net/wireless/rtl8187_rtl8225.c | 2 --
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index b32b4147a91b..ebe99b0432dc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9344e86e577df483475845096dba07f2deb11ce3
+refs/heads/master: 2f20596b50ee964715f9ad44d848802f0baba5d8
diff --git a/trunk/drivers/net/wireless/rtl8187_dev.c b/trunk/drivers/net/wireless/rtl8187_dev.c
index 6260ed8ce12b..b4927d08507e 100644
--- a/trunk/drivers/net/wireless/rtl8187_dev.c
+++ b/trunk/drivers/net/wireless/rtl8187_dev.c
@@ -669,7 +669,7 @@ static int rtl8187b_init_hw(struct ieee80211_hw *dev)
 	rtl818x_iowrite16(priv, &priv->map->RFPinsOutput, 0x0480);
 	rtl818x_iowrite16(priv, &priv->map->RFPinsSelect, 0x2488);
 	rtl818x_iowrite16(priv, &priv->map->RFPinsEnable, 0x1FFF);
-	msleep(1100);
+	msleep(100);
 
 	priv->rf->init(dev);
 
diff --git a/trunk/drivers/net/wireless/rtl8187_rtl8225.c b/trunk/drivers/net/wireless/rtl8187_rtl8225.c
index b999f87ed150..85965e0ec75a 100644
--- a/trunk/drivers/net/wireless/rtl8187_rtl8225.c
+++ b/trunk/drivers/net/wireless/rtl8187_rtl8225.c
@@ -862,10 +862,8 @@ static void rtl8225z2_b_rf_init(struct ieee80211_hw *dev)
 	rtl8225_write(dev, 0x3, 0x080); msleep(1);
 	rtl8225_write(dev, 0x5, 0x004); msleep(1);
 	rtl8225_write(dev, 0x0, 0x0B7); msleep(1);
-	msleep(3000);
 
 	rtl8225_write(dev, 0x2, 0xC4D); msleep(1);
-	msleep(2000);
 
 	rtl8225_write(dev, 0x2, 0x44D); msleep(1);
 	rtl8225_write(dev, 0x0, 0x2BF); msleep(1);