From afea8b72dad2305cee22b4b4ad1d6a6230480bef Mon Sep 17 00:00:00 2001
From: "Justin P. Mattock" <justinmattock@gmail.com>
Date: Mon, 21 May 2012 07:56:57 -0700
Subject: [PATCH] --- yaml --- r: 317166 b: refs/heads/master c:
 3fe192d8e0c99ca3b96573cdc7cc03cfcf935f74 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 47401cb7cde3..b1090883293e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8a7245ea2c48641257ff149569b56650d0cfc99c
+refs/heads/master: 3fe192d8e0c99ca3b96573cdc7cc03cfcf935f74
diff --git a/trunk/drivers/staging/rts_pstor/ms.c b/trunk/drivers/staging/rts_pstor/ms.c
index 0bf6d95b3fab..7cc2b53f20d0 100644
--- a/trunk/drivers/staging/rts_pstor/ms.c
+++ b/trunk/drivers/staging/rts_pstor/ms.c
@@ -2488,7 +2488,7 @@ int reset_ms_card(struct rtsx_chip *chip)
 
 	if (!CHK_MSPRO(ms_card)) {
 		/* Build table for the last segment,
-		 * to check if L2P talbe block exist,erasing it
+		 * to check if L2P table block exists, erasing it
 		 */
 		retval = ms_build_l2p_tbl(chip, ms_card->total_block / 512 - 1);
 		if (retval != STATUS_SUCCESS) {
diff --git a/trunk/drivers/staging/rts_pstor/sd.c b/trunk/drivers/staging/rts_pstor/sd.c
index aab690932eae..b9474a8aefc0 100644
--- a/trunk/drivers/staging/rts_pstor/sd.c
+++ b/trunk/drivers/staging/rts_pstor/sd.c
@@ -1169,7 +1169,7 @@ static int sd_check_switch_mode(struct rtsx_chip *chip, u8 mode,
 		RTSX_DEBUGP("func_group4_mask = 0x%02x\n", buf[0x07]);
 	} else {
 		/* Maximum current consumption, check whether current is acceptable;
-		 * bit[511:496] = 0x0000 means some error happaned.
+		 * bit[511:496] = 0x0000 means some error happened.
 		 */
 		u16 cc = ((u16)buf[0] << 8) | buf[1];
 		RTSX_DEBUGP("Maximum current consumption: %dmA\n", cc);