summaryrefslogtreecommitdiffstats
path: root/drivers/regulator/core.c
diff options
context:
space:
mode:
authorLee Jones2014-05-23 17:44:10 +0200
committerMark Brown2014-05-23 19:55:23 +0200
commit9f8c0fe9542141fd0008d5c0f6ae365890f6da94 (patch)
tree82537978d790be97aa3c32af2762af1c04e37f36 /drivers/regulator/core.c
parentLinux 3.15-rc1 (diff)
downloadkernel-qcow2-linux-9f8c0fe9542141fd0008d5c0f6ae365890f6da94.tar.gz
kernel-qcow2-linux-9f8c0fe9542141fd0008d5c0f6ae365890f6da94.tar.xz
kernel-qcow2-linux-9f8c0fe9542141fd0008d5c0f6ae365890f6da94.zip
regulator: Constify the pointer to alias name array
Toughen-up checks for read-only regulator names. Signed-off-by: Lee Jones <lee.jones@linaro.org> Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'drivers/regulator/core.c')
-rw-r--r--drivers/regulator/core.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index 9a09f3cdbabb..ba28d29b66d2 100644
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -1597,9 +1597,10 @@ EXPORT_SYMBOL_GPL(regulator_unregister_supply_alias);
* registered any aliases that were registered will be removed
* before returning to the caller.
*/
-int regulator_bulk_register_supply_alias(struct device *dev, const char **id,
+int regulator_bulk_register_supply_alias(struct device *dev,
+ const char *const *id,
struct device *alias_dev,
- const char **alias_id,
+ const char *const *alias_id,
int num_id)
{
int i;
@@ -1637,7 +1638,7 @@ EXPORT_SYMBOL_GPL(regulator_bulk_register_supply_alias);
* aliases in one operation.
*/
void regulator_bulk_unregister_supply_alias(struct device *dev,
- const char **id,
+ const char *const *id,
int num_id)
{
int i;