1 files changed, 11 insertions, 9 deletions

diff --git a/drivers/mtd/maps/physmap_of.c b/drivers/mtd/maps/physmap_of.c
index ec3edf6e68b4..9861814aa027 100644
--- a/drivers/mtd/maps/physmap_of.c
+++ b/drivers/mtd/maps/physmap_of.c
@@ -50,7 +50,7 @@ static int parse_obsolete_partitions(struct platform_device *dev,
 {
         int i, plen, nr_parts;
         const struct {
-                u32 offset, len;
+                __be32 offset, len;
         } *part;
         const char *names;
 
@@ -69,9 +69,9 @@ static int parse_obsolete_partitions(struct platform_device *dev,
         names = of_get_property(dp, "partition-names", &plen);
 
         for (i = 0; i < nr_parts; i++) {
-                info->parts[i].offset = part->offset;
-                info->parts[i].size   = part->len & ~1;
-                if (part->len & 1) /* bit 0 set signifies read only partition */
+                info->parts[i].offset = be32_to_cpu(part->offset);
+                info->parts[i].size   = be32_to_cpu(part->len) & ~1;
+                if (be32_to_cpu(part->len) & 1) /* bit 0 set signifies read only partition */
                         info->parts[i].mask_flags = MTD_WRITEABLE;
 
                 if (names && (plen > 0)) {
@@ -226,11 +226,11 @@ static int __devinit of_flash_probe(struct platform_device *dev,
         struct resource res;
         struct of_flash *info;
         const char *probe_type = match->data;
-        const u32 *width;
+        const __be32 *width;
         int err;
         int i;
         int count;
-        const u32 *p;
+        const __be32 *p;
         int reg_tuple_size;
         struct mtd_info **mtd_list = NULL;
         resource_size_t res_size;
@@ -267,9 +267,11 @@ static int __devinit of_flash_probe(struct platform_device *dev,
         for (i = 0; i < count; i++) {
                 err = -ENXIO;
                 if (of_address_to_resource(dp, i, &res)) {
-                        dev_err(&dev->dev, "Can't get IO address from device"
-                                " tree\n");
-                        goto err_out;
+                        /*
+                         * Continue with next register tuple if this
+                         * one is not mappable
+                         */
+                        continue;
                 }
 
                 dev_dbg(&dev->dev, "of_flash device: %.8llx-%.8llx\n",