| Message ID | 1521137299-31363-1-git-send-email-sudeep.holla@arm.com |
|---|---|
| State | New |
| Headers | show |
| Series | [-next] hwmon: (scmi) return -EINVAL when sensor information is unavailable | expand |
On 03/15/2018 11:08 AM, Sudeep Holla wrote: > Passing NULL pointer to PTR_ERR will result in return value of 0 > indicating success which is clearly not what it is intended here. > > This patch returns -EINVAL instead when the sensor information is not > available. > > Fixes: b23688aefb8b ("hwmon: add support for sensors exported via ARM SCMI") > Reported-by: Dan Carpenter <dan.carpenter@oracle.com> > Cc: Guenter Roeck <linux@roeck-us.net> > Cc: linux-hwmon@vger.kernel.org > Signed-off-by: Sudeep Holla <sudeep.holla@arm.com> Acked-by: Guenter Roeck <linux@roeck-us.net> > --- > drivers/hwmon/scmi-hwmon.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > Hi Guenter, > > I will try to push this via ARM-SoC if possible before v4.17 merge window. > So please provide Ack if you are fine. > > Regards, > Sudeep > > diff --git a/drivers/hwmon/scmi-hwmon.c b/drivers/hwmon/scmi-hwmon.c > index 32e750373ced..363bf56eb0f2 100644 > --- a/drivers/hwmon/scmi-hwmon.c > +++ b/drivers/hwmon/scmi-hwmon.c > @@ -138,7 +138,7 @@ static int scmi_hwmon_probe(struct scmi_device *sdev) > for (i = 0; i < nr_sensors; i++) { > sensor = handle->sensor_ops->info_get(handle, i); > if (!sensor) > - return PTR_ERR(sensor); > + return -EINVAL; > > switch (sensor->type) { > case TEMPERATURE_C: >
diff --git a/drivers/hwmon/scmi-hwmon.c b/drivers/hwmon/scmi-hwmon.c index 32e750373ced..363bf56eb0f2 100644 --- a/drivers/hwmon/scmi-hwmon.c +++ b/drivers/hwmon/scmi-hwmon.c @@ -138,7 +138,7 @@ static int scmi_hwmon_probe(struct scmi_device *sdev) for (i = 0; i < nr_sensors; i++) { sensor = handle->sensor_ops->info_get(handle, i); if (!sensor) - return PTR_ERR(sensor); + return -EINVAL; switch (sensor->type) { case TEMPERATURE_C:
Passing NULL pointer to PTR_ERR will result in return value of 0 indicating success which is clearly not what it is intended here. This patch returns -EINVAL instead when the sensor information is not available. Fixes: b23688aefb8b ("hwmon: add support for sensors exported via ARM SCMI") Reported-by: Dan Carpenter <dan.carpenter@oracle.com> Cc: Guenter Roeck <linux@roeck-us.net> Cc: linux-hwmon@vger.kernel.org Signed-off-by: Sudeep Holla <sudeep.holla@arm.com> --- drivers/hwmon/scmi-hwmon.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Hi Guenter, I will try to push this via ARM-SoC if possible before v4.17 merge window. So please provide Ack if you are fine. Regards, Sudeep -- 2.7.4