From bfde842dd9b5026d90360a107c9f64c4f482eb0d Mon Sep 17 00:00:00 2001
From: Erik Jones <erik@ejnode.com>
Date: Mon, 16 Jul 2012 23:51:15 -0400
Subject: [PATCH] --- yaml --- r: 318031 b: refs/heads/master c:
 cf3a5ca084979f0087a8e6f6cd34a6d5ee0decb5 h: refs/heads/master i:   318029:
 8d9903666100782c67ed05cfacc604838de422bb   318027:
 5b12d06dc7235cf20895d0666b15d6b069624efe   318023:
 c17bc2dd3a0b0e031a2c359e2bdc7c4038586af6   318015:
 811d1bef32bf068dd2c599611c904263958d7e2b v: v3

---
 [refs]                                      | 2 +-
 trunk/drivers/staging/rts5139/rts51x_card.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index d2408617dcd3..557ea78c1d96 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 39d48bb0607f1c8ac4c57ddba534a402f4fc91e7
+refs/heads/master: cf3a5ca084979f0087a8e6f6cd34a6d5ee0decb5
diff --git a/trunk/drivers/staging/rts5139/rts51x_card.c b/trunk/drivers/staging/rts5139/rts51x_card.c
index a3cb55912875..50be42ac592b 100644
--- a/trunk/drivers/staging/rts5139/rts51x_card.c
+++ b/trunk/drivers/staging/rts5139/rts51x_card.c
@@ -826,8 +826,7 @@ int card_power_on(struct rts51x_chip *chip, u8 card)
 	if ((card == SD_CARD) || (card == XD_CARD)) {
 		RTS51X_WRITE_REG(chip, CARD_PWR_CTL, mask | LDO3318_PWR_MASK,
 				 val1 | LDO_SUSPEND);
-	}
-	else {
+	} else {
 #endif
 		RTS51X_WRITE_REG(chip, CARD_PWR_CTL, mask, val1);
 #ifdef SD_XD_IO_FOLLOW_PWR