From fe7b6573ce200b79ece04a490e7fecac946cd7ad Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@linux-foundation.org>
Date: Wed, 19 Mar 2008 17:01:04 -0700
Subject: [PATCH] --- yaml --- r: 87513 b: refs/heads/master c:
 8195096bf2e3756264561d7a47d547bafd4e9100 h: refs/heads/master i:   87511:
 ff567530a0a03c1da3fb9e50ffeb1fe877e887bd v: v3

---
 [refs]                                  | 2 +-
 trunk/drivers/memstick/host/jmb38x_ms.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index e6480f78b8c3..ad5bf2f1da92 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d3597ea2f2fa71695ab8204691ff4562aea8357b
+refs/heads/master: 8195096bf2e3756264561d7a47d547bafd4e9100
diff --git a/trunk/drivers/memstick/host/jmb38x_ms.c b/trunk/drivers/memstick/host/jmb38x_ms.c
index fcfa24b7b1db..9a57504183c7 100644
--- a/trunk/drivers/memstick/host/jmb38x_ms.c
+++ b/trunk/drivers/memstick/host/jmb38x_ms.c
@@ -274,7 +274,7 @@ static int jmb38x_ms_transfer_data(struct jmb38x_ms_host *host)
 {
 	unsigned int length;
 	unsigned int off;
-	unsigned int t_size, p_off, p_cnt;
+	unsigned int t_size, p_cnt;
 	unsigned char *buf;
 	struct page *pg;
 	unsigned long flags = 0;
@@ -288,6 +288,8 @@ static int jmb38x_ms_transfer_data(struct jmb38x_ms_host *host)
 	}
 
 	while (length) {
+		unsigned int uninitialized_var(p_off);
+
 		if (host->req->long_data) {
 			pg = nth_page(sg_page(&host->req->sg),
 				      off >> PAGE_SHIFT);