| Message ID | 1448283281-21402-1-git-send-email-sudipm.mukherjee@gmail.com (mailing list archive) |
|---|---|
| State | Changes Requested |
| Delegated to: | Eduardo Valentin |
| Headers | show |
On Mon, Nov 23, 2015 at 06:24:41PM +0530, Sudip Mukherjee wrote: > We were only checking if data is not NULL but > ti_bandgap_get_sensor_data() can return NULL or ERR_PTR. Do you have a fail case? Can you please send the logs too? > > Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org> > --- > drivers/thermal/ti-soc-thermal/ti-thermal-common.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/thermal/ti-soc-thermal/ti-thermal-common.c b/drivers/thermal/ti-soc-thermal/ti-thermal-common.c > index b213a12..d76bb7c 100644 > --- a/drivers/thermal/ti-soc-thermal/ti-thermal-common.c > +++ b/drivers/thermal/ti-soc-thermal/ti-thermal-common.c > @@ -365,7 +365,7 @@ int ti_thermal_remove_sensor(struct ti_bandgap *bgp, int id) > > data = ti_bandgap_get_sensor_data(bgp, id); > > - if (data && data->ti_thermal) { > + if (!IS_ERR_OR_NULL(data) && data->ti_thermal) { I don t really see the need for this as we always ti_bandgap_set_sensor_data with a valid pointer, never with a ERR PTR. So, it would be either valid or NULL. > if (data->our_zone) > thermal_zone_device_unregister(data->ti_thermal); > else > -- > 1.9.1 > -- To unsubscribe from this list: send the line "unsubscribe linux-pm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Mon, Nov 23, 2015 at 03:25:43PM -0800, Eduardo Valentin wrote: > On Mon, Nov 23, 2015 at 06:24:41PM +0530, Sudip Mukherjee wrote: > > We were only checking if data is not NULL but > > ti_bandgap_get_sensor_data() can return NULL or ERR_PTR. > > Do you have a fail case? Can you please send the logs too? > > > > > Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org> > > --- > > drivers/thermal/ti-soc-thermal/ti-thermal-common.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/drivers/thermal/ti-soc-thermal/ti-thermal-common.c b/drivers/thermal/ti-soc-thermal/ti-thermal-common.c > > index b213a12..d76bb7c 100644 > > --- a/drivers/thermal/ti-soc-thermal/ti-thermal-common.c > > +++ b/drivers/thermal/ti-soc-thermal/ti-thermal-common.c > > @@ -365,7 +365,7 @@ int ti_thermal_remove_sensor(struct ti_bandgap *bgp, int id) > > > > data = ti_bandgap_get_sensor_data(bgp, id); > > > > - if (data && data->ti_thermal) { > > + if (!IS_ERR_OR_NULL(data) && data->ti_thermal) { > > I don t really see the need for this as we always > ti_bandgap_set_sensor_data with a valid pointer, never with a ERR PTR. > So, it would be either valid or NULL. ERR_PTR is not coming from ti_bandgap_set_sensor_data(). In ti_bandgap_get_sensor_data() if ti_bandgap_validate() fails then it returns ERR_PTR(ret). So just by checking for NULL we are not checking for any error return from ti_bandgap_validate(). regards sudip -- To unsubscribe from this list: send the line "unsubscribe linux-pm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/thermal/ti-soc-thermal/ti-thermal-common.c b/drivers/thermal/ti-soc-thermal/ti-thermal-common.c index b213a12..d76bb7c 100644 --- a/drivers/thermal/ti-soc-thermal/ti-thermal-common.c +++ b/drivers/thermal/ti-soc-thermal/ti-thermal-common.c @@ -365,7 +365,7 @@ int ti_thermal_remove_sensor(struct ti_bandgap *bgp, int id) data = ti_bandgap_get_sensor_data(bgp, id); - if (data && data->ti_thermal) { + if (!IS_ERR_OR_NULL(data) && data->ti_thermal) { if (data->our_zone) thermal_zone_device_unregister(data->ti_thermal); else
We were only checking if data is not NULL but ti_bandgap_get_sensor_data() can return NULL or ERR_PTR. Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org> --- drivers/thermal/ti-soc-thermal/ti-thermal-common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)