From 811cd961093c168648f349960762b98d7b337086 Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Thu, 11 May 2017 10:06:41 +0200 Subject: of: of_find_node_by_devpath: Fix offset in mtd devices When a cdev is a mtd device the partition offset must be used from there, not from the cdev. Signed-off-by: Sascha Hauer --- drivers/of/of_path.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/of/of_path.c b/drivers/of/of_path.c index a5886dffac..334eab841a 100644 --- a/drivers/of/of_path.c +++ b/drivers/of/of_path.c @@ -142,7 +142,10 @@ struct device_node *of_find_node_by_devpath(struct device_node *root, const char */ if (cdev->master) { is_partition = true; - part_offset = cdev->offset; + if (cdev->mtd) + part_offset = cdev->mtd->master_offset; + else + part_offset = cdev->offset; part_size = cdev->size; pr_debug("%s path %s: is a partition with offset 0x%08llx, size 0x%08llx\n", __func__, path, part_offset, part_size); -- cgit v1.2.3