diff options
| author | Maarten ter Huurne <maarten@treewalker.org> | 2016-03-17 10:05:06 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-03-21 13:52:07 -0400 |
| commit | e6e79fd9cee682b137779d2da3b379251927d99f (patch) | |
| tree | 3e004fa6fe4665a9176f6ca7c53ae44b51f8e199 /drivers/regulator | |
| parent | de14ba67378df74c6328f75fd6972ef83ed4639b (diff) | |
regulator: act8865: Remove "too many regulators" error handler
The check would dereference pdata, which can be NULL in the non-DT
use case.
Nothing will break if pdata->num_regulators is larger than the number
of regulators that the driver defines: pdata->num_regulators is only
read in act8865_get_init_data() to iterate through pdata->regulators.
The error handler might have some value as a sanity check on the
platform data, but the platform data could be broken in many other
ways that are not checked for (unknown IDs, duplicate IDs), so I see
no reason to perform only this specific check.
Signed-off-by: Maarten ter Huurne <maarten@treewalker.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers/regulator')
| -rw-r--r-- | drivers/regulator/act8865-regulator.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/regulator/act8865-regulator.c b/drivers/regulator/act8865-regulator.c index 89f856f257f7..69cdad0f71ba 100644 --- a/drivers/regulator/act8865-regulator.c +++ b/drivers/regulator/act8865-regulator.c | |||
| @@ -485,12 +485,6 @@ static int act8865_pmic_probe(struct i2c_client *client, | |||
| 485 | pdata = &pdata_of; | 485 | pdata = &pdata_of; |
| 486 | } | 486 | } |
| 487 | 487 | ||
| 488 | if (pdata->num_regulators > num_regulators) { | ||
| 489 | dev_err(dev, "too many regulators: %d\n", | ||
| 490 | pdata->num_regulators); | ||
| 491 | return -EINVAL; | ||
| 492 | } | ||
| 493 | |||
| 494 | act8865 = devm_kzalloc(dev, sizeof(struct act8865), GFP_KERNEL); | 488 | act8865 = devm_kzalloc(dev, sizeof(struct act8865), GFP_KERNEL); |
| 495 | if (!act8865) | 489 | if (!act8865) |
| 496 | return -ENOMEM; | 490 | return -ENOMEM; |