aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/base
diff options
context:
space:
mode:
authorPankaj Dubey <pankaj.dubey@samsung.com>2014-09-18 05:42:20 -0400
committerMark Brown <broonie@kernel.org>2014-09-18 13:55:31 -0400
commit6e64b6ccc1e46932768e3bb8974fc2e5589bca7a (patch)
treed051e0d1e325837e45a1bf3427144d8121dffa35 /drivers/base
parentcf673fbc6342b1c2310cdfdc4ed99f18f866b8e4 (diff)
regmap: fix NULL pointer dereference in regmap_get_val_endian
Recents commits for getting reg endianness causing NULL pointer dereference if dev is passed NULL in regmap_init_mmio. This patch fixes this issue, and allows to parse reg endianness only if dev and dev->of_node exist. Signed-off-by: Pankaj Dubey <pankaj.dubey@samsung.com> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers/base')
-rw-r--r--drivers/base/regmap/regmap.c23
1 files changed, 14 insertions, 9 deletions
diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c
index 01ae4b829360..fd7ae9a10c4d 100644
--- a/drivers/base/regmap/regmap.c
+++ b/drivers/base/regmap/regmap.c
@@ -477,7 +477,7 @@ static enum regmap_endian regmap_get_val_endian(struct device *dev,
477 const struct regmap_bus *bus, 477 const struct regmap_bus *bus,
478 const struct regmap_config *config) 478 const struct regmap_config *config)
479{ 479{
480 struct device_node *np = dev->of_node; 480 struct device_node *np;
481 enum regmap_endian endian; 481 enum regmap_endian endian;
482 482
483 /* Retrieve the endianness specification from the regmap config */ 483 /* Retrieve the endianness specification from the regmap config */
@@ -487,15 +487,20 @@ static enum regmap_endian regmap_get_val_endian(struct device *dev,
487 if (endian != REGMAP_ENDIAN_DEFAULT) 487 if (endian != REGMAP_ENDIAN_DEFAULT)
488 return endian; 488 return endian;
489 489
490 /* Parse the device's DT node for an endianness specification */ 490 /* If the dev and dev->of_node exist try to get endianness from DT */
491 if (of_property_read_bool(np, "big-endian")) 491 if (dev && dev->of_node) {
492 endian = REGMAP_ENDIAN_BIG; 492 np = dev->of_node;
493 else if (of_property_read_bool(np, "little-endian"))
494 endian = REGMAP_ENDIAN_LITTLE;
495 493
496 /* If the endianness was specified in DT, use that */ 494 /* Parse the device's DT node for an endianness specification */
497 if (endian != REGMAP_ENDIAN_DEFAULT) 495 if (of_property_read_bool(np, "big-endian"))
498 return endian; 496 endian = REGMAP_ENDIAN_BIG;
497 else if (of_property_read_bool(np, "little-endian"))
498 endian = REGMAP_ENDIAN_LITTLE;
499
500 /* If the endianness was specified in DT, use that */
501 if (endian != REGMAP_ENDIAN_DEFAULT)
502 return endian;
503 }
499 504
500 /* Retrieve the endianness specification from the bus config */ 505 /* Retrieve the endianness specification from the bus config */
501 if (bus && bus->val_format_endian_default) 506 if (bus && bus->val_format_endian_default)