Merge remote branch 'origin' into secretlab/next-devicetree

Merging in current state of Linus' tree to deal with merge conflicts and
build failures in vio.c after merge.

Conflicts:
	drivers/i2c/busses/i2c-cpm.c
	drivers/i2c/busses/i2c-mpc.c
	drivers/net/gianfar.c

Also fixed up one line in arch/powerpc/kernel/vio.c to use the
correct node pointer.

Signed-off-by: Grant Likely <grant.likely@secretlab.ca>

10 files changed, 126 insertions, 68 deletions

diff --git a/drivers/mtd/maps/Kconfig b/drivers/mtd/maps/Kconfig
index aa2807d0ce72..f22bc9f05ddb 100644
--- a/drivers/mtd/maps/Kconfig
+++ b/drivers/mtd/maps/Kconfig
@@ -435,7 +435,7 @@ config MTD_PCI
 
 config MTD_PCMCIA
         tristate "PCMCIA MTD driver"
-        depends on PCMCIA && MTD_COMPLEX_MAPPINGS && BROKEN
+        depends on PCMCIA && MTD_COMPLEX_MAPPINGS
         help
           Map driver for accessing PCMCIA linear flash memory cards. These
           cards are usually around 4-16MiB in size. This does not include
diff --git a/drivers/mtd/maps/bfin-async-flash.c b/drivers/mtd/maps/bfin-async-flash.c
index c0fd99b0c525..85dd18193cf2 100644
--- a/drivers/mtd/maps/bfin-async-flash.c
+++ b/drivers/mtd/maps/bfin-async-flash.c
@@ -70,7 +70,7 @@ static void switch_back(struct async_state *state)
         local_irq_restore(state->irq_flags);
 }
 
-static map_word bfin_read(struct map_info *map, unsigned long ofs)
+static map_word bfin_flash_read(struct map_info *map, unsigned long ofs)
 {
         struct async_state *state = (struct async_state *)map->map_priv_1;
         uint16_t word;
@@ -86,7 +86,7 @@ static map_word bfin_read(struct map_info *map, unsigned long ofs)
         return test;
 }
 
-static void bfin_copy_from(struct map_info *map, void *to, unsigned long from, ssize_t len)
+static void bfin_flash_copy_from(struct map_info *map, void *to, unsigned long from, ssize_t len)
 {
         struct async_state *state = (struct async_state *)map->map_priv_1;
 
@@ -97,7 +97,7 @@ static void bfin_copy_from(struct map_info *map, void *to, unsigned long from, s
         switch_back(state);
 }
 
-static void bfin_write(struct map_info *map, map_word d1, unsigned long ofs)
+static void bfin_flash_write(struct map_info *map, map_word d1, unsigned long ofs)
 {
         struct async_state *state = (struct async_state *)map->map_priv_1;
         uint16_t d;
@@ -112,7 +112,7 @@ static void bfin_write(struct map_info *map, map_word d1, unsigned long ofs)
         switch_back(state);
 }
 
-static void bfin_copy_to(struct map_info *map, unsigned long to, const void *from, ssize_t len)
+static void bfin_flash_copy_to(struct map_info *map, unsigned long to, const void *from, ssize_t len)
 {
         struct async_state *state = (struct async_state *)map->map_priv_1;
 
@@ -141,10 +141,10 @@ static int __devinit bfin_flash_probe(struct platform_device *pdev)
                 return -ENOMEM;
 
         state->map.name       = DRIVER_NAME;
-        state->map.read       = bfin_read;
-        state->map.copy_from  = bfin_copy_from;
-        state->map.write      = bfin_write;
-        state->map.copy_to    = bfin_copy_to;
+        state->map.read       = bfin_flash_read;
+        state->map.copy_from  = bfin_flash_copy_from;
+        state->map.write      = bfin_flash_write;
+        state->map.copy_to    = bfin_flash_copy_to;
         state->map.bankwidth  = pdata->width;
         state->map.size       = memory->end - memory->start + 1;
         state->map.virt       = (void __iomem *)memory->start;
diff --git a/drivers/mtd/maps/ceiva.c b/drivers/mtd/maps/ceiva.c
index d41f34766e53..c09f4f57093e 100644
--- a/drivers/mtd/maps/ceiva.c
+++ b/drivers/mtd/maps/ceiva.c
@@ -253,7 +253,7 @@ static void __exit clps_destroy_mtd(struct clps_info *clps, struct mtd_info *mtd
 
 static int __init clps_setup_flash(void)
 {
-        int nr;
+        int nr = 0;
 
 #ifdef CONFIG_ARCH_CEIVA
         if (machine_is_ceiva()) {
diff --git a/drivers/mtd/maps/ixp2000.c b/drivers/mtd/maps/ixp2000.c
index 1bdf0ee6d0b6..9639d83a9d6c 100644
--- a/drivers/mtd/maps/ixp2000.c
+++ b/drivers/mtd/maps/ixp2000.c
@@ -165,12 +165,11 @@ static int ixp2000_flash_probe(struct platform_device *dev)
                 return -EIO;
         }
 
-        info = kmalloc(sizeof(struct ixp2000_flash_info), GFP_KERNEL);
+        info = kzalloc(sizeof(struct ixp2000_flash_info), GFP_KERNEL);
         if(!info) {
                 err = -ENOMEM;
                 goto Error;
         }
-        memset(info, 0, sizeof(struct ixp2000_flash_info));
 
         platform_set_drvdata(dev, info);
 
diff --git a/drivers/mtd/maps/ixp4xx.c b/drivers/mtd/maps/ixp4xx.c
index 7b0515297411..e0a5e0426ead 100644
--- a/drivers/mtd/maps/ixp4xx.c
+++ b/drivers/mtd/maps/ixp4xx.c
@@ -107,8 +107,8 @@ static void ixp4xx_copy_from(struct map_info *map, void *to,
                 return;
 
         if (from & 1) {
-                *dest++ = BYTE1(flash_read16(src));
-                src++;
+                *dest++ = BYTE1(flash_read16(src-1));
+                src++;
                 --len;
         }
 
@@ -196,12 +196,11 @@ static int ixp4xx_flash_probe(struct platform_device *dev)
                         return err;
         }
 
-        info = kmalloc(sizeof(struct ixp4xx_flash_info), GFP_KERNEL);
+        info = kzalloc(sizeof(struct ixp4xx_flash_info), GFP_KERNEL);
         if(!info) {
                 err = -ENOMEM;
                 goto Error;
         }
-        memset(info, 0, sizeof(struct ixp4xx_flash_info));
 
         platform_set_drvdata(dev, info);
 
diff --git a/drivers/mtd/maps/pcmciamtd.c b/drivers/mtd/maps/pcmciamtd.c
index 689d6a79ffc0..e699e6ac23df 100644
--- a/drivers/mtd/maps/pcmciamtd.c
+++ b/drivers/mtd/maps/pcmciamtd.c
@@ -40,10 +40,7 @@ MODULE_PARM_DESC(debug, "Set Debug Level 0=quiet, 5=noisy");
 static const int debug = 0;
 #endif
 
-#define err(format, arg...) printk(KERN_ERR "pcmciamtd: " format "\n" , ## arg)
 #define info(format, arg...) printk(KERN_INFO "pcmciamtd: " format "\n" , ## arg)
-#define warn(format, arg...) printk(KERN_WARNING "pcmciamtd: " format "\n" , ## arg)
-
 
 #define DRIVER_DESC     "PCMCIA Flash memory card driver"
 
@@ -52,7 +49,6 @@ static const int debug = 0;
 
 struct pcmciamtd_dev {
         struct pcmcia_device    *p_dev;
-        dev_node_t      node;           /* device node */
         caddr_t         win_base;       /* ioremapped address of PCMCIA window */
         unsigned int    win_size;       /* size of window */
         unsigned int    offset;         /* offset into card the window currently points at */
@@ -100,7 +96,9 @@ module_param(mem_type, int, 0);
 MODULE_PARM_DESC(mem_type, "Set Memory type (0=Flash, 1=RAM, 2=ROM, default=0)");
 
 
-/* read/write{8,16} copy_{from,to} routines with window remapping to access whole card */
+/* read/write{8,16} copy_{from,to} routines with window remapping
+ * to access whole card
+ */
 static caddr_t remap_window(struct map_info *map, unsigned long to)
 {
         struct pcmciamtd_dev *dev = (struct pcmciamtd_dev *)map->map_priv_1;
@@ -137,7 +135,7 @@ static map_word pcmcia_read8_remap(struct map_info *map, unsigned long ofs)
                 return d;
 
         d.x[0] = readb(addr);
-        DEBUG(3, "ofs = 0x%08lx (%p) data = 0x%02x", ofs, addr, d.x[0]);
+        DEBUG(3, "ofs = 0x%08lx (%p) data = 0x%02lx", ofs, addr, d.x[0]);
         return d;
 }
 
@@ -152,7 +150,7 @@ static map_word pcmcia_read16_remap(struct map_info *map, unsigned long ofs)
                 return d;
 
         d.x[0] = readw(addr);
-        DEBUG(3, "ofs = 0x%08lx (%p) data = 0x%04x", ofs, addr, d.x[0]);
+        DEBUG(3, "ofs = 0x%08lx (%p) data = 0x%04lx", ofs, addr, d.x[0]);
         return d;
 }
 
@@ -162,7 +160,7 @@ static void pcmcia_copy_from_remap(struct map_info *map, void *to, unsigned long
         struct pcmciamtd_dev *dev = (struct pcmciamtd_dev *)map->map_priv_1;
         unsigned long win_size = dev->win_size;
 
-        DEBUG(3, "to = %p from = %lu len = %u", to, from, len);
+        DEBUG(3, "to = %p from = %lu len = %zd", to, from, len);
         while(len) {
                 int toread = win_size - (from & (win_size-1));
                 caddr_t addr;
@@ -190,7 +188,7 @@ static void pcmcia_write8_remap(struct map_info *map, map_word d, unsigned long
         if(!addr)
                 return;
 
-        DEBUG(3, "adr = 0x%08lx (%p)  data = 0x%02x", adr, addr, d.x[0]);
+        DEBUG(3, "adr = 0x%08lx (%p)  data = 0x%02lx", adr, addr, d.x[0]);
         writeb(d.x[0], addr);
 }
 
@@ -201,7 +199,7 @@ static void pcmcia_write16_remap(struct map_info *map, map_word d, unsigned long
         if(!addr)
                 return;
 
-        DEBUG(3, "adr = 0x%08lx (%p)  data = 0x%04x", adr, addr, d.x[0]);
+        DEBUG(3, "adr = 0x%08lx (%p)  data = 0x%04lx", adr, addr, d.x[0]);
         writew(d.x[0], addr);
 }
 
@@ -211,7 +209,7 @@ static void pcmcia_copy_to_remap(struct map_info *map, unsigned long to, const v
         struct pcmciamtd_dev *dev = (struct pcmciamtd_dev *)map->map_priv_1;
         unsigned long win_size = dev->win_size;
 
-        DEBUG(3, "to = %lu from = %p len = %u", to, from, len);
+        DEBUG(3, "to = %lu from = %p len = %zd", to, from, len);
         while(len) {
                 int towrite = win_size - (to & (win_size-1));
                 caddr_t addr;
@@ -245,7 +243,8 @@ static map_word pcmcia_read8(struct map_info *map, unsigned long ofs)
                 return d;
 
         d.x[0] = readb(win_base + ofs);
-        DEBUG(3, "ofs = 0x%08lx (%p) data = 0x%02x", ofs, win_base + ofs, d.x[0]);
+        DEBUG(3, "ofs = 0x%08lx (%p) data = 0x%02lx",
+              ofs, win_base + ofs, d.x[0]);
         return d;
 }
 
@@ -259,7 +258,8 @@ static map_word pcmcia_read16(struct map_info *map, unsigned long ofs)
                 return d;
 
         d.x[0] = readw(win_base + ofs);
-        DEBUG(3, "ofs = 0x%08lx (%p) data = 0x%04x", ofs, win_base + ofs, d.x[0]);
+        DEBUG(3, "ofs = 0x%08lx (%p) data = 0x%04lx",
+              ofs, win_base + ofs, d.x[0]);
         return d;
 }
 
@@ -271,32 +271,34 @@ static void pcmcia_copy_from(struct map_info *map, void *to, unsigned long from,
         if(DEV_REMOVED(map))
                 return;
 
-        DEBUG(3, "to = %p from = %lu len = %u", to, from, len);
+        DEBUG(3, "to = %p from = %lu len = %zd", to, from, len);
         memcpy_fromio(to, win_base + from, len);
 }
 
 
-static void pcmcia_write8(struct map_info *map, u8 d, unsigned long adr)
+static void pcmcia_write8(struct map_info *map, map_word d, unsigned long adr)
 {
         caddr_t win_base = (caddr_t)map->map_priv_2;
 
         if(DEV_REMOVED(map))
                 return;
 
-        DEBUG(3, "adr = 0x%08lx (%p)  data = 0x%02x", adr, win_base + adr, d);
-        writeb(d, win_base + adr);
+        DEBUG(3, "adr = 0x%08lx (%p)  data = 0x%02lx",
+              adr, win_base + adr, d.x[0]);
+        writeb(d.x[0], win_base + adr);
 }
 
 
-static void pcmcia_write16(struct map_info *map, u16 d, unsigned long adr)
+static void pcmcia_write16(struct map_info *map, map_word d, unsigned long adr)
 {
         caddr_t win_base = (caddr_t)map->map_priv_2;
 
         if(DEV_REMOVED(map))
                 return;
 
-        DEBUG(3, "adr = 0x%08lx (%p)  data = 0x%04x", adr, win_base + adr, d);
-        writew(d, win_base + adr);
+        DEBUG(3, "adr = 0x%08lx (%p)  data = 0x%04lx",
+              adr, win_base + adr, d.x[0]);
+        writew(d.x[0], win_base + adr);
 }
 
 
@@ -307,7 +309,7 @@ static void pcmcia_copy_to(struct map_info *map, unsigned long to, const void *f
         if(DEV_REMOVED(map))
                 return;
 
-        DEBUG(3, "to = %lu from = %p len = %u", to, from, len);
+        DEBUG(3, "to = %lu from = %p len = %zd", to, from, len);
         memcpy_toio(win_base + to, from, len);
 }
 
@@ -376,7 +378,8 @@ static int pcmciamtd_cistpl_jedec(struct pcmcia_device *p_dev,
         if (!pcmcia_parse_tuple(tuple, &parse)) {
                 cistpl_jedec_t *t = &parse.jedec;
                 for (i = 0; i < t->nid; i++)
-                        DEBUG(2, "JEDEC: 0x%02x 0x%02x", t->id[i].mfr, t->id[i].info);
+                        DEBUG(2, "JEDEC: 0x%02x 0x%02x",
+                              t->id[i].mfr, t->id[i].info);
         }
         return -ENOSPC;
 }
@@ -432,7 +435,7 @@ static int pcmciamtd_cistpl_geo(struct pcmcia_device *p_dev,
 }
 
 
-static void card_settings(struct pcmciamtd_dev *dev, struct pcmcia_device *link, int *new_name)
+static void card_settings(struct pcmciamtd_dev *dev, struct pcmcia_device *p_dev, int *new_name)
 {
         int i;
 
@@ -477,7 +480,8 @@ static void card_settings(struct pcmciamtd_dev *dev, struct pcmcia_device *link,
         }
 
         DEBUG(1, "Device: Size: %lu Width:%d Name: %s",
-              dev->pcmcia_map.size, dev->pcmcia_map.bankwidth << 3, dev->mtd_name);
+              dev->pcmcia_map.size,
+              dev->pcmcia_map.bankwidth << 3, dev->mtd_name);
 }
 
 
@@ -490,7 +494,6 @@ static int pcmciamtd_config(struct pcmcia_device *link)
 {
         struct pcmciamtd_dev *dev = link->priv;
         struct mtd_info *mtd = NULL;
-        cs_status_t status;
         win_req_t req;
         int ret;
         int i;
@@ -514,9 +517,11 @@ static int pcmciamtd_config(struct pcmcia_device *link)
         if(setvpp == 1)
                 dev->pcmcia_map.set_vpp = pcmciamtd_set_vpp;
 
-        /* Request a memory window for PCMCIA. Some architeures can map windows upto the maximum
-           that PCMCIA can support (64MiB) - this is ideal and we aim for a window the size of the
-           whole card - otherwise we try smaller windows until we succeed */
+        /* Request a memory window for PCMCIA. Some architeures can map windows
+         * upto the maximum that PCMCIA can support (64MiB) - this is ideal and
+         * we aim for a window the size of the whole card - otherwise we try
+         * smaller windows until we succeed
+         */
 
         req.Attributes =  WIN_MEMORY_TYPE_CM | WIN_ENABLE;
         req.Attributes |= (dev->pcmcia_map.bankwidth == 1) ? WIN_DATA_WIDTH_8 : WIN_DATA_WIDTH_16;
@@ -544,7 +549,7 @@ static int pcmciamtd_config(struct pcmcia_device *link)
         DEBUG(2, "dev->win_size = %d", dev->win_size);
 
         if(!dev->win_size) {
-                err("Cant allocate memory window");
+                dev_err(&dev->p_dev->dev, "Cannot allocate memory window\n");
                 pcmciamtd_release(link);
                 return -ENODEV;
         }
@@ -554,7 +559,8 @@ static int pcmciamtd_config(struct pcmcia_device *link)
         DEBUG(2, "window handle = 0x%8.8lx", (unsigned long)link->win);
         dev->win_base = ioremap(req.Base, req.Size);
         if(!dev->win_base) {
-                err("ioremap(%lu, %u) failed", req.Base, req.Size);
+                dev_err(&dev->p_dev->dev, "ioremap(%lu, %u) failed\n",
+                        req.Base, req.Size);
                 pcmciamtd_release(link);
                 return -ENODEV;
         }
@@ -565,7 +571,7 @@ static int pcmciamtd_config(struct pcmcia_device *link)
         dev->pcmcia_map.map_priv_1 = (unsigned long)dev;
         dev->pcmcia_map.map_priv_2 = (unsigned long)link->win;
 
-        dev->vpp = (vpp) ? vpp : link->socket.socket.Vpp;
+        dev->vpp = (vpp) ? vpp : link->socket->socket.Vpp;
         link->conf.Attributes = 0;
         if(setvpp == 2) {
                 link->conf.Vpp = dev->vpp;
@@ -601,7 +607,7 @@ static int pcmciamtd_config(struct pcmcia_device *link)
         }
 
         if(!mtd) {
-                DEBUG(1, "Cant find an MTD");
+                DEBUG(1, "Can not find an MTD");
                 pcmciamtd_release(link);
                 return -ENODEV;
         }
@@ -612,8 +618,9 @@ static int pcmciamtd_config(struct pcmcia_device *link)
         if(new_name) {
                 int size = 0;
                 char unit = ' ';
-                /* Since we are using a default name, make it better by adding in the
-                   size */
+                /* Since we are using a default name, make it better by adding
+                 * in the size
+                 */
                 if(mtd->size < 1048576) { /* <1MiB in size, show size in KiB */
                         size = mtd->size >> 10;
                         unit = 'K';
@@ -643,17 +650,15 @@ static int pcmciamtd_config(struct pcmcia_device *link)
         if(add_mtd_device(mtd)) {
                 map_destroy(mtd);
                 dev->mtd_info = NULL;
-                err("Couldnt register MTD device");
+                dev_err(&dev->p_dev->dev,
+                        "Could not register the MTD device\n");
                 pcmciamtd_release(link);
                 return -ENODEV;
         }
-        snprintf(dev->node.dev_name, sizeof(dev->node.dev_name), "mtd%d", mtd->index);
-        info("mtd%d: %s", mtd->index, mtd->name);
-        link->dev_node = &dev->node;
+        dev_info(&dev->p_dev->dev, "mtd%d: %s\n", mtd->index, mtd->name);
         return 0;
 
- failed:
-        err("CS Error, exiting");
+        dev_err(&dev->p_dev->dev, "CS Error, exiting\n");
         pcmciamtd_release(link);
         return -ENODEV;
 }
@@ -692,8 +697,9 @@ static void pcmciamtd_detach(struct pcmcia_device *link)
 
         if(dev->mtd_info) {
                 del_mtd_device(dev->mtd_info);
+                dev_info(&dev->p_dev->dev, "mtd%d: Removing\n",
+                         dev->mtd_info->index);
                 map_destroy(dev->mtd_info);
-                info("mtd%d: Removed", dev->mtd_info->index);
         }
 
         pcmciamtd_release(link);
@@ -737,8 +743,11 @@ static struct pcmcia_device_id pcmciamtd_ids[] = {
         PCMCIA_DEVICE_PROD_ID12("intel", "VALUE SERIES 100 ", 0x40ade711, 0xdf8506d8),
         PCMCIA_DEVICE_PROD_ID12("KINGMAX TECHNOLOGY INC.", "SRAM 256K Bytes", 0x54d0c69c, 0xad12c29c),
         PCMCIA_DEVICE_PROD_ID12("Maxtor", "MAXFL MobileMax Flash Memory Card", 0xb68968c8, 0x2dfb47b0),
+        PCMCIA_DEVICE_PROD_ID123("M-Systems", "M-SYS Flash Memory Card", "(c) M-Systems", 0x7ed2ad87, 0x675dc3fb, 0x7aef3965),
+        PCMCIA_DEVICE_PROD_ID12("PRETEC", "  2MB SRAM CARD", 0xebf91155, 0x805360ca),
         PCMCIA_DEVICE_PROD_ID12("SEIKO EPSON", "WWB101EN20", 0xf9876baf, 0xad0b207b),
         PCMCIA_DEVICE_PROD_ID12("SEIKO EPSON", "WWB513EN20", 0xf9876baf, 0xe8d884ad),
+        PCMCIA_DEVICE_PROD_ID12("SMART Modular Technologies", " 4MB FLASH Card", 0x96fd8277, 0x737a5b05),
         PCMCIA_DEVICE_PROD_ID12("Starfish, Inc.", "REX-3000", 0x05ddca47, 0xe7d67bca),
         PCMCIA_DEVICE_PROD_ID12("Starfish, Inc.", "REX-4100", 0x05ddca47, 0x7bc32944),
         /* the following was commented out in pcmcia-cs-3.2.7 */
diff --git a/drivers/mtd/maps/physmap.c b/drivers/mtd/maps/physmap.c
index d9603f7f9652..426461a5f0d4 100644
--- a/drivers/mtd/maps/physmap.c
+++ b/drivers/mtd/maps/physmap.c
@@ -264,8 +264,11 @@ static int __init physmap_init(void)
 
         err = platform_driver_register(&physmap_flash_driver);
 #ifdef CONFIG_MTD_PHYSMAP_COMPAT
-        if (err == 0)
-                platform_device_register(&physmap_flash);
+        if (err == 0) {
+                err = platform_device_register(&physmap_flash);
+                if (err)
+                        platform_driver_unregister(&physmap_flash_driver);
+        }
 #endif
 
         return err;
diff --git a/drivers/mtd/maps/physmap_of.c b/drivers/mtd/maps/physmap_of.c
index 4147fe328c55..ba124baa646d 100644
--- a/drivers/mtd/maps/physmap_of.c
+++ b/drivers/mtd/maps/physmap_of.c
@@ -173,12 +173,53 @@ static struct mtd_info * __devinit obsolete_probe(struct of_device *dev,
         }
 }
 
+#ifdef CONFIG_MTD_PARTITIONS
+/* When partitions are set we look for a linux,part-probe property which
+   specifies the list of partition probers to use. If none is given then the
+   default is use. These take precedence over other device tree
+   information. */
+static const char *part_probe_types_def[] = { "cmdlinepart", "RedBoot", NULL };
+static const char ** __devinit of_get_probes(struct device_node *dp)
+{
+        const char *cp;
+        int cplen;
+        unsigned int l;
+        unsigned int count;
+        const char **res;
+
+        cp = of_get_property(dp, "linux,part-probe", &cplen);
+        if (cp == NULL)
+                return part_probe_types_def;
+
+        count = 0;
+        for (l = 0; l != cplen; l++)
+                if (cp[l] == 0)
+                        count++;
+
+        res = kzalloc((count + 1)*sizeof(*res), GFP_KERNEL);
+        count = 0;
+        while (cplen > 0) {
+                res[count] = cp;
+                l = strlen(cp) + 1;
+                cp += l;
+                cplen -= l;
+                count++;
+        }
+        return res;
+}
+
+static void __devinit of_free_probes(const char **probes)
+{
+        if (probes != part_probe_types_def)
+                kfree(probes);
+}
+#endif
+
 static int __devinit of_flash_probe(struct of_device *dev,
                                     const struct of_device_id *match)
 {
 #ifdef CONFIG_MTD_PARTITIONS
-        static const char *part_probe_types[]
-                = { "cmdlinepart", "RedBoot", NULL };
+        const char **part_probe_types;
 #endif
         struct device_node *dp = dev->dev.of_node;
         struct resource res;
@@ -218,7 +259,7 @@ static int __devinit of_flash_probe(struct of_device *dev,
 
         dev_set_drvdata(&dev->dev, info);
 
-        mtd_list = kzalloc(sizeof(struct mtd_info) * count, GFP_KERNEL);
+        mtd_list = kzalloc(sizeof(*mtd_list) * count, GFP_KERNEL);
         if (!mtd_list)
                 goto err_flash_remove;
 
@@ -307,12 +348,14 @@ static int __devinit of_flash_probe(struct of_device *dev,
                 goto err_out;
 
 #ifdef CONFIG_MTD_PARTITIONS
-        /* First look for RedBoot table or partitions on the command
-         * line, these take precedence over device tree information */
+        part_probe_types = of_get_probes(dp);
         err = parse_mtd_partitions(info->cmtd, part_probe_types,
                                    &info->parts, 0);
-        if (err < 0)
+        if (err < 0) {
+                of_free_probes(part_probe_types);
                 return err;
+        }
+        of_free_probes(part_probe_types);
 
 #ifdef CONFIG_MTD_OF_PARTS
         if (err == 0) {
diff --git a/drivers/mtd/maps/pismo.c b/drivers/mtd/maps/pismo.c
index 60c068db452d..eb476b7f8d11 100644
--- a/drivers/mtd/maps/pismo.c
+++ b/drivers/mtd/maps/pismo.c
@@ -234,6 +234,7 @@ static int __devexit pismo_remove(struct i2c_client *client)
         /* FIXME: set_vpp needs saner arguments */
         pismo_setvpp_remove_fix(pismo);
 
+        i2c_set_clientdata(client, NULL);
         kfree(pismo);
 
         return 0;
@@ -272,7 +273,7 @@ static int __devinit pismo_probe(struct i2c_client *client,
         ret = pismo_eeprom_read(client, &eeprom, 0, sizeof(eeprom));
         if (ret < 0) {
                 dev_err(&client->dev, "error reading EEPROM: %d\n", ret);
-                return ret;
+                goto exit_free;
         }
 
         dev_info(&client->dev, "%.15s board found\n", eeprom.board);
@@ -283,6 +284,11 @@ static int __devinit pismo_probe(struct i2c_client *client,
                                       pdata->cs_addrs[i]);
 
         return 0;
+
+ exit_free:
+        i2c_set_clientdata(client, NULL);
+        kfree(pismo);
+        return ret;
 }
 
 static const struct i2c_device_id pismo_id[] = {
diff --git a/drivers/mtd/maps/pxa2xx-flash.c b/drivers/mtd/maps/pxa2xx-flash.c
index 91dc6331053f..dd90880048cf 100644
--- a/drivers/mtd/maps/pxa2xx-flash.c
+++ b/drivers/mtd/maps/pxa2xx-flash.c
@@ -63,11 +63,10 @@ static int __init pxa2xx_flash_probe(struct platform_device *pdev)
         if (!res)
                 return -ENODEV;
 
-        info = kmalloc(sizeof(struct pxa2xx_flash_info), GFP_KERNEL);
+        info = kzalloc(sizeof(struct pxa2xx_flash_info), GFP_KERNEL);
         if (!info)
                 return -ENOMEM;
 
-        memset(info, 0, sizeof(struct pxa2xx_flash_info));
         info->map.name = (char *) flash->name;
         info->map.bankwidth = flash->width;
         info->map.phys = res->start;