From 4f4d131a1bc1f67bfa5d4d648295422e7c22777a Mon Sep 17 00:00:00 2001
From: Toshiaki Yamane <yamanetoshi@gmail.com>
Date: Fri, 7 Sep 2012 13:28:09 +0900
Subject: [PATCH] --- yaml --- r: 325011 b: refs/heads/master c:
 220e7b3cb5ed36347fb6c7f87207d8cb0387d71a h: refs/heads/master i:   325009:
 28a00ab833244812650b590587cbb1907e66215d   325007:
 32b74eb659794b01a0197deb23497d05e64f58bc v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/staging/rts_pstor/sd.c | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 3ec368a04be4..3ddf4c6eceb4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 97d31286b77e997dee9a78f945d84662d981eab9
+refs/heads/master: 220e7b3cb5ed36347fb6c7f87207d8cb0387d71a
diff --git a/trunk/drivers/staging/rts_pstor/sd.c b/trunk/drivers/staging/rts_pstor/sd.c
index aae9c729a118..2b7a4e1b39f3 100644
--- a/trunk/drivers/staging/rts_pstor/sd.c
+++ b/trunk/drivers/staging/rts_pstor/sd.c
@@ -1141,13 +1141,12 @@ static int sd_check_switch_mode(struct rtsx_chip *chip, u8 mode,
 		 */
 		u16 cc = ((u16)buf[0] << 8) | buf[1];
 		RTSX_DEBUGP("Maximum current consumption: %dmA\n", cc);
-		if ((cc == 0) || (cc > 800)) {
+		if ((cc == 0) || (cc > 800))
 			TRACE_RET(chip, STATUS_FAIL);
-		}
+
 		retval = sd_query_switch_result(chip, func_group, func_to_switch, buf, 64);
-		if (retval != STATUS_SUCCESS) {
+		if (retval != STATUS_SUCCESS)
 			TRACE_RET(chip, STATUS_FAIL);
-		}
 
 		if ((cc > 400) || (func_to_switch > CURRENT_LIMIT_400)) {
 			RTSX_WRITE_REG(chip, OCPPARA2, SD_OCP_THD_MASK, chip->sd_800mA_ocp_thd);