diff --git a/[refs] b/[refs] index b14874244948..bb289657ae27 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4fc8a6078660be781d6ddf4daddfd9d817d2a455 +refs/heads/master: f96880d1e859e3937eb691da8293700b8eec17b3 diff --git a/trunk/drivers/mtd/nand/alauda.c b/trunk/drivers/mtd/nand/alauda.c index 2c29854b4241..257937cd99bf 100644 --- a/trunk/drivers/mtd/nand/alauda.c +++ b/trunk/drivers/mtd/nand/alauda.c @@ -408,7 +408,7 @@ static int alauda_bounce_read(struct mtd_info *mtd, loff_t from, size_t len, *retlen = len; while (len) { u8 oob[16]; - u32 byte = from & al->bytemask; + size_t byte = from & al->bytemask; size_t cplen = min(len, mtd->writesize - byte); err = alauda_read_page(mtd, from, bounce_buf, oob,