Patched in Tegra support.

1 files changed, 16 insertions, 8 deletions

diff --git a/drivers/mtd/maps/vmu-flash.c b/drivers/mtd/maps/vmu-flash.c
index 6b223cfe92b..3a04b078576 100644
--- a/drivers/mtd/maps/vmu-flash.c
+++ b/drivers/mtd/maps/vmu-flash.c
@@ -360,6 +360,9 @@ 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;
@@ -431,6 +434,11 @@ 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;
@@ -536,9 +544,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);
@@ -596,7 +604,7 @@ fail_name:
 }
 
 /* Handles very basic info about the flash, queries for details */
-static int vmu_connect(struct maple_device *mdev)
+static int __devinit vmu_connect(struct maple_device *mdev)
 {
         unsigned long test_flash_data, basic_flash_data;
         int c, error;
@@ -690,7 +698,7 @@ fail_nomem:
         return error;
 }
 
-static void vmu_disconnect(struct maple_device *mdev)
+static void __devexit vmu_disconnect(struct maple_device *mdev)
 {
         struct memcard *card;
         struct mdev_part *mpart;
@@ -772,7 +780,7 @@ static void vmu_file_error(struct maple_device *mdev, void *recvbuf)
 }
 
 
-static int probe_maple_vmu(struct device *dev)
+static int __devinit probe_maple_vmu(struct device *dev)
 {
         int error;
         struct maple_device *mdev = to_maple_dev(dev);
@@ -789,7 +797,7 @@ static int probe_maple_vmu(struct device *dev)
         return 0;
 }
 
-static int remove_maple_vmu(struct device *dev)
+static int __devexit remove_maple_vmu(struct device *dev)
 {
         struct maple_device *mdev = to_maple_dev(dev);
 
@@ -802,7 +810,7 @@ static struct maple_driver vmu_flash_driver = {
         .drv = {
                 .name =         "Dreamcast_visual_memory",
                 .probe =        probe_maple_vmu,
-                .remove =       remove_maple_vmu,
+                .remove =       __devexit_p(remove_maple_vmu),
         },
 };