From 04df3bc433fbd71c7d36e37e13b67c083d8f585c Mon Sep 17 00:00:00 2001
From: wwang <wei_wang@realsil.com.cn>
Date: Tue, 8 Mar 2011 15:22:14 +0800
Subject: [PATCH] --- yaml --- r: 236352 b: refs/heads/master c:
 9fe341e834bec1cad92c3f320931d0563674e112 h: refs/heads/master v: v3

---
 [refs]                                 |  2 +-
 trunk/drivers/staging/rts_pstor/ms.c   | 14 +++++++++-----
 trunk/drivers/staging/rts_pstor/rtsx.c |  1 +
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 745e36bbcd49..3fab5931edcf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7c31607e165d5edfa13dea5d329e59f322d4cad2
+refs/heads/master: 9fe341e834bec1cad92c3f320931d0563674e112
diff --git a/trunk/drivers/staging/rts_pstor/ms.c b/trunk/drivers/staging/rts_pstor/ms.c
index c43f9118dca9..810e170894f5 100644
--- a/trunk/drivers/staging/rts_pstor/ms.c
+++ b/trunk/drivers/staging/rts_pstor/ms.c
@@ -1099,7 +1099,14 @@ static int reset_ms_pro(struct rtsx_chip *chip)
 	struct ms_info *ms_card = &(chip->ms_card);
 	int retval;
 #ifdef XC_POWERCLASS
-	u8 change_power_class = 2;
+	u8 change_power_class;
+
+	if (chip->ms_power_class_en & 0x02)
+		change_power_class = 2;
+	else if (chip->ms_power_class_en & 0x01)
+		change_power_class = 1;
+	else
+		change_power_class = 0;
 #endif
 
 #ifdef XC_POWERCLASS
@@ -1128,10 +1135,7 @@ static int reset_ms_pro(struct rtsx_chip *chip)
 	}
 
 	if (change_power_class && CHK_MSXC(ms_card)) {
-		u8 power_class_en = 0x03;
-
-		if (CHECK_PID(chip, 0x5209))
-			power_class_en = chip->ms_power_class_en;
+		u8 power_class_en = chip->ms_power_class_en;
 
 		RTSX_DEBUGP("power_class_en = 0x%x\n", power_class_en);
 		RTSX_DEBUGP("change_power_class = %d\n", change_power_class);
diff --git a/trunk/drivers/staging/rts_pstor/rtsx.c b/trunk/drivers/staging/rts_pstor/rtsx.c
index db3470e93fa1..4514419a5fb8 100644
--- a/trunk/drivers/staging/rts_pstor/rtsx.c
+++ b/trunk/drivers/staging/rts_pstor/rtsx.c
@@ -850,6 +850,7 @@ static void rtsx_init_options(struct rtsx_chip *chip)
 	chip->sd_default_rx_phase = 15;
 	chip->pmos_pwr_on_interval = 200;
 	chip->sd_voltage_switch_delay = 1000;
+	chip->ms_power_class_en = 3;
 
 	chip->sd_400mA_ocp_thd = 1;
 	chip->sd_800mA_ocp_thd = 5;