Merge tag 'mmc-updates-for-3.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel...

[~andy/linux] / drivers / mtd / bcm47xxpart.c

diff --git a/drivers/mtd/bcm47xxpart.c b/drivers/mtd/bcm47xxpart.c
index 9279a9174f84ad9cd3a2ae2c7117c29cc8134e9e..7a6384b0962a9de2c92dffb81f1fc45d6d89a490 100644 (file)
--- a/drivers/mtd/bcm47xxpart.c
+++ b/drivers/mtd/bcm47xxpart.c
@@ -27,11 +27,13 @@
 
 /* Magics */
 #define BOARD_DATA_MAGIC               0x5246504D      /* MPFR */
+#define FACTORY_MAGIC                  0x59544346      /* FCTY */
 #define POT_MAGIC1                     0x54544f50      /* POTT */
 #define POT_MAGIC2                     0x504f          /* OP */
 #define ML_MAGIC1                      0x39685a42
 #define ML_MAGIC2                      0x26594131
 #define TRX_MAGIC                      0x30524448
+#define SQSH_MAGIC                     0x71736873      /* shsq */
 
 struct trx_header {
        uint32_t magic;
@@ -71,7 +73,14 @@ static int bcm47xxpart_parse(struct mtd_info *master,
        /* Alloc */
        parts = kzalloc(sizeof(struct mtd_partition) * BCM47XXPART_MAX_PARTS,
                        GFP_KERNEL);
+       if (!parts)
+               return -ENOMEM;
+
        buf = kzalloc(BCM47XXPART_BYTES_TO_READ, GFP_KERNEL);
+       if (!buf) {
+               kfree(parts);
+               return -ENOMEM;
+       }
 
        /* Parse block by block looking for magics */
        for (offset = 0; offset <= master->size - blocksize;
@@ -110,6 +119,13 @@ static int bcm47xxpart_parse(struct mtd_info *master,
                        continue;
                }
 
+               /* Found on Huawei E970 */
+               if (buf[0x000 / 4] == FACTORY_MAGIC) {
+                       bcm47xxpart_add_part(&parts[curr_part++], "factory",
+                                            offset, MTD_WRITEABLE);
+                       continue;
+               }
+
                /* POT(TOP) */
                if (buf[0x000 / 4] == POT_MAGIC1 &&
                    (buf[0x004 / 4] & 0xFFFF) == POT_MAGIC2) {
@@ -167,6 +183,13 @@ static int bcm47xxpart_parse(struct mtd_info *master,
                        offset = rounddown(offset + trx->length, blocksize);
                        continue;
                }
+
+               /* Squashfs on devices not using TRX */
+               if (buf[0x000 / 4] == SQSH_MAGIC) {
+                       bcm47xxpart_add_part(&parts[curr_part++], "rootfs",
+                                            offset, 0);
+                       continue;
+               }
        }
 
        /* Look for NVRAM at the end of the last block. */