summaryrefslogtreecommitdiff
path: root/drivers/core
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2015-07-06 12:54:38 -0600
committerSimon Glass <sjg@chromium.org>2015-07-21 17:39:33 -0600
commit9f4629be8a9a06211e392ff0eccbff76603488b2 (patch)
treec2534dcdd45d65447028f8402685841be9886392 /drivers/core
parent85aeda4a62775326d616c7bc5876b4bd00cb1a3e (diff)
dm: core: Add device checking to syscon_get_regmap()
This function can only handle a syscon device. It is possible that someone will make a mistake, so add a check for this. Also we should return -ENODEV when a device cannot be found, so update the syscon_get_regmap_by_driver_data() to follow this convention. Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'drivers/core')
-rw-r--r--drivers/core/syscon-uclass.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/core/syscon-uclass.c b/drivers/core/syscon-uclass.c
index 4d66bb5d50..686c32056e 100644
--- a/drivers/core/syscon-uclass.c
+++ b/drivers/core/syscon-uclass.c
@@ -17,8 +17,11 @@
struct regmap *syscon_get_regmap(struct udevice *dev)
{
- struct syscon_uc_info *priv = dev_get_uclass_priv(dev);
+ struct syscon_uc_info *priv;
+ if (device_get_uclass_id(dev) != UCLASS_SYSCON)
+ return ERR_PTR(-ENOEXEC);
+ priv = dev_get_uclass_priv(dev);
return priv->regmap;
}
@@ -52,7 +55,7 @@ struct regmap *syscon_get_regmap_by_driver_data(ulong driver_data)
}
}
- return ERR_PTR(-ENOENT);
+ return ERR_PTR(-ENODEV);
}
void *syscon_get_first_range(ulong driver_data)