We are currently required to do two checks for regulator pointer:
IS_ERR() and IS_NULL().
And multiple instances are reported, about both of these not being used
consistently and so resulting in crashes.
Fix that by initializing regulator pointer with an error value and
checking it only against an error.
This makes code more consistent and more efficient.
Fixes: 7d34d56ef334 (PM / OPP: Disable OPPs that aren't supported by the regulator)
Reported-and-tested-by: Jon Hunter <jonathanh@nvidia.com>
Reported-and-tested-by: Tony Lindgren <tony@atomide.com>
Reported-and-tested-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
[ rjw: Initialize to -ENXIO ]
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
(cherry picked from commit
0c717d0f9cb46259dce5272705adce64a2d646d9)
Signed-off-by: Alex Shi <alex.shi@linaro.org>
}
reg = dev_opp->regulator;
}
reg = dev_opp->regulator;
- if (IS_ERR_OR_NULL(reg)) {
/* Regulator may not be required for device */
if (reg)
dev_err(dev, "%s: Invalid regulator (%ld)\n", __func__,
/* Regulator may not be required for device */
if (reg)
dev_err(dev, "%s: Invalid regulator (%ld)\n", __func__,
+ /* Set regulator to a non-NULL error value */
+ dev_opp->regulator = ERR_PTR(-ENXIO);
+
/* Find clk for the device */
dev_opp->clk = clk_get(dev, NULL);
if (IS_ERR(dev_opp->clk)) {
/* Find clk for the device */
dev_opp->clk = clk_get(dev, NULL);
if (IS_ERR(dev_opp->clk)) {
if (dev_opp->prop_name)
return;
if (dev_opp->prop_name)
return;
- if (!IS_ERR_OR_NULL(dev_opp->regulator))
+ if (!IS_ERR(dev_opp->regulator))
return;
/* Release clk */
return;
/* Release clk */
{
struct regulator *reg = dev_opp->regulator;
{
struct regulator *reg = dev_opp->regulator;
- if (!IS_ERR_OR_NULL(reg) &&
!regulator_is_supported_voltage(reg, opp->u_volt_min,
opp->u_volt_max)) {
pr_warn("%s: OPP minuV: %lu maxuV: %lu, not supported by regulator\n",
!regulator_is_supported_voltage(reg, opp->u_volt_min,
opp->u_volt_max)) {
pr_warn("%s: OPP minuV: %lu maxuV: %lu, not supported by regulator\n",
}
/* Already have a regulator set */
}
/* Already have a regulator set */
- if (WARN_ON(!IS_ERR_OR_NULL(dev_opp->regulator))) {
+ if (WARN_ON(!IS_ERR(dev_opp->regulator))) {
ret = -EBUSY;
goto err;
}
ret = -EBUSY;
goto err;
}
- if (IS_ERR_OR_NULL(dev_opp->regulator)) {
+ if (IS_ERR(dev_opp->regulator)) {
dev_err(dev, "%s: Doesn't have regulator set\n", __func__);
goto unlock;
}
dev_err(dev, "%s: Doesn't have regulator set\n", __func__);
goto unlock;
}
WARN_ON(!list_empty(&dev_opp->opp_list));
regulator_put(dev_opp->regulator);
WARN_ON(!list_empty(&dev_opp->opp_list));
regulator_put(dev_opp->regulator);
- dev_opp->regulator = ERR_PTR(-EINVAL);
+ dev_opp->regulator = ERR_PTR(-ENXIO);
/* Try freeing device_opp if this was the last blocking resource */
_remove_device_opp(dev_opp);
/* Try freeing device_opp if this was the last blocking resource */
_remove_device_opp(dev_opp);