2 files changed, 4 insertions, 2 deletions

diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c
index 45108ed85588..d5f24089be71 100644
--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
@@ -378,7 +378,9 @@ static int m25p80_write(struct mtd_info *mtd, loff_t to, size_t len,
 
                         spi_sync(flash->spi, &m);
 
-                        *retlen += m.actual_length - sizeof(flash->command);
+                        if (retlen)
+                                *retlen += m.actual_length
+                                        - sizeof(flash->command);
                 }
         }
 
diff --git a/drivers/mtd/devices/mtd_dataflash.c b/drivers/mtd/devices/mtd_dataflash.c
index 99d3a0320fc9..155737e7483f 100644
--- a/drivers/mtd/devices/mtd_dataflash.c
+++ b/drivers/mtd/devices/mtd_dataflash.c
@@ -508,7 +508,7 @@ add_dataflash(struct spi_device *spi, char *name,
                         priv->partitioned = 1;
                         return add_mtd_partitions(device, parts, nr_parts);
                 }
-        } else if (pdata->nr_parts)
+        } else if (pdata && pdata->nr_parts)
                 dev_warn(&spi->dev, "ignoring %d default partitions on %s\n",
                                 pdata->nr_parts, device->name);