aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorArtem Bityutskiy <Artem.Bityutskiy@nokia.com>2009-07-08 03:15:41 -0400
committerArtem Bityutskiy <Artem.Bityutskiy@nokia.com>2009-07-08 03:15:41 -0400
commit83c2099f5e1f0a4621ed4f20fc539069c636a24b (patch)
tree0a9cbeeb77330a853663162d406eee9d0174e29a /drivers
parentebf53f421308c2f59c9bcbad4c5c297a0d00199a (diff)
UBI: fix compilation warnings
The recent "UBI: fix NOR flash recovery" introduced compilation warnings which were immediately spotted by our linux-next keeper. This patch fixes them. Reported-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/mtd/ubi/io.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/mtd/ubi/io.c b/drivers/mtd/ubi/io.c
index c3bd2e34c642..4cb69925d8d9 100644
--- a/drivers/mtd/ubi/io.c
+++ b/drivers/mtd/ubi/io.c
@@ -481,16 +481,16 @@ static int nor_erase_prepare(struct ubi_device *ubi, int pnum)
481 uint32_t data = 0; 481 uint32_t data = 0;
482 482
483 addr = (loff_t)pnum * ubi->peb_size; 483 addr = (loff_t)pnum * ubi->peb_size;
484 err = ubi->mtd->write(ubi->mtd, addr, 4, &written, &data); 484 err = ubi->mtd->write(ubi->mtd, addr, 4, &written, (void *)&data);
485 if (err) { 485 if (err) {
486 ubi_err("error %d while writing 4 bytes to PEB %d:0, written " 486 ubi_err("error %d while writing 4 bytes to PEB %d:%d, written "
487 "%zd bytes", err, pnum, 0, written); 487 "%zd bytes", err, pnum, 0, written);
488 ubi_dbg_dump_stack(); 488 ubi_dbg_dump_stack();
489 return err; 489 return err;
490 } 490 }
491 491
492 addr += ubi->vid_hdr_aloffset; 492 addr += ubi->vid_hdr_aloffset;
493 err = ubi->mtd->write(ubi->mtd, addr, 4, &written, &data); 493 err = ubi->mtd->write(ubi->mtd, addr, 4, &written, (void *)&data);
494 if (err) { 494 if (err) {
495 ubi_err("error %d while writing 4 bytes to PEB %d:%d, written " 495 ubi_err("error %d while writing 4 bytes to PEB %d:%d, written "
496 "%zd bytes", err, pnum, ubi->vid_hdr_aloffset, written); 496 "%zd bytes", err, pnum, ubi->vid_hdr_aloffset, written);