From de2204e43b493abdd624430f6163186069803d0a Mon Sep 17 00:00:00 2001
From: Hauke Mehrtens <hauke@hauke-m.de>
Date: Thu, 24 Jan 2013 17:39:54 +0100
Subject: [PATCH] --- yaml --- r: 360367 b: refs/heads/master c:
 60aca067b5308705a34dbb6548b459487f92da90 h: refs/heads/master i:   360365:
 ec8410ddcc1977604612e551ce95fefa35f0ddb7   360363:
 fd6e0a8650d34593dfcb68319599b978429f4307   360359:
 684aa60ac7451914688fbf2b5aa5cb38687987dc   360351:
 086cdeceebb6f2a68cf163b318373eab26ed9728 v: v3

---
 [refs]                                    | 2 +-
 trunk/drivers/mtd/devices/bcm47xxsflash.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 9c83c6b2a6a7..026a32c79ba2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 92d0e09abeebdd3f699c9f12401a9e3998a20546
+refs/heads/master: 60aca067b5308705a34dbb6548b459487f92da90
diff --git a/trunk/drivers/mtd/devices/bcm47xxsflash.c b/trunk/drivers/mtd/devices/bcm47xxsflash.c
index 8fe1a097161b..61a45cbde377 100644
--- a/trunk/drivers/mtd/devices/bcm47xxsflash.c
+++ b/trunk/drivers/mtd/devices/bcm47xxsflash.c
@@ -23,6 +23,7 @@ static int bcm47xxsflash_read(struct mtd_info *mtd, loff_t from, size_t len,
 
 	memcpy_fromio(buf, (void __iomem *)KSEG0ADDR(b47s->window + from),
 		      len);
+	*retlen = len;
 
 	return len;
 }