From 9d7bdbfc876c3ceb5dc258433493a86bbc152163 Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Fri, 28 Mar 2008 14:16:09 -0700 Subject: [PATCH] --- yaml --- r: 87909 b: refs/heads/master c: d250dad64a154a9f95ec3574e2ffc97d9f61a19c h: refs/heads/master i: 87907: 2d1a90ad73ebba47861b2b1fcd1313b534a7a778 v: v3 --- [refs] | 2 +- trunk/drivers/memstick/host/tifm_ms.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index e2782feaa4e4..3d7df2d804f0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4a5691c0f7b65b7aa9d237e55f05e691352caac7 +refs/heads/master: d250dad64a154a9f95ec3574e2ffc97d9f61a19c diff --git a/trunk/drivers/memstick/host/tifm_ms.c b/trunk/drivers/memstick/host/tifm_ms.c index eb150dfb637f..8577de4ebb0e 100644 --- a/trunk/drivers/memstick/host/tifm_ms.c +++ b/trunk/drivers/memstick/host/tifm_ms.c @@ -182,7 +182,7 @@ static unsigned int tifm_ms_transfer_data(struct tifm_ms *host) struct tifm_dev *sock = host->dev; 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; @@ -198,6 +198,8 @@ static unsigned int tifm_ms_transfer_data(struct tifm_ms *host) host->block_pos); while (length) { + unsigned int uninitialized_var(p_off); + if (host->req->long_data) { pg = nth_page(sg_page(&host->req->sg), off >> PAGE_SHIFT);