Merge tag 'for-3.8' of git://openrisc.net/~jonas/linux

[deliverable/linux.git] / drivers / mtd / maps / vmu-flash.c

diff --git a/drivers/mtd/maps/vmu-flash.c b/drivers/mtd/maps/vmu-flash.c
index 3a04b078576a0aa04ee07afa4fec48c56fe3f43b..2e2b0945edc7622159a3a2f8a1391d75c574eec8 100644 (file)
--- a/drivers/mtd/maps/vmu-flash.c
+++ b/drivers/mtd/maps/vmu-flash.c
@@ -360,9 +360,6 @@ static int vmu_flash_read(struct mtd_info *mtd, loff_t from, size_t len,
        int index = 0, retval, partition, leftover, numblocks;
        unsigned char cx;
 
-       if (len < 1)
-               return -EIO;
-
        mpart = mtd->priv;
        mdev = mpart->mdev;
        partition = mpart->partition;
@@ -434,11 +431,6 @@ static int vmu_flash_write(struct mtd_info *mtd, loff_t to, size_t len,
        partition = mpart->partition;
        card = maple_get_drvdata(mdev);
 
-       /* simple sanity checks */
-       if (len < 1) {
-               error = -EIO;
-               goto failed;
-       }
        numblocks = card->parts[partition].numblocks;
        if (to + len > numblocks * card->blocklen)
                len = numblocks * card->blocklen - to;
@@ -544,9 +536,9 @@ static void vmu_queryblocks(struct mapleq *mq)
        mtd_cur->flags = MTD_WRITEABLE|MTD_NO_ERASE;
        mtd_cur->size = part_cur->numblocks * card->blocklen;
        mtd_cur->erasesize = card->blocklen;
-       mtd_cur->write = vmu_flash_write;
-       mtd_cur->read = vmu_flash_read;
-       mtd_cur->sync = vmu_flash_sync;
+       mtd_cur->_write = vmu_flash_write;
+       mtd_cur->_read = vmu_flash_read;
+       mtd_cur->_sync = vmu_flash_sync;
        mtd_cur->writesize = card->blocklen;
 
        mpart = kmalloc(sizeof(struct mdev_part), GFP_KERNEL);