Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 35b052a6 authored by Eduardo Valentin's avatar Eduardo Valentin Committed by Greg Kroah-Hartman
Browse files

staging: omap-thermal: fix error checking 



The omap_bandgap_get_sensor_data() function returns ERR_PTR(),
but it can also return NULL, in case of initilization, so we need to use
IS_ERR_OR_NULL() rather than only IS_ERR().

Signed-off-by: default avatarEduardo Valentin <eduardo.valentin@ti.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 24796e12

drivers/staging/omap-thermal/omap-thermal-common.c

+2 −2
Original line number Diff line number Diff line
@@ -260,7 +260,7 @@ int omap_thermal_expose_sensor(struct omap_bandgap *bg_ptr, int id, 


	data = omap_bandgap_get_sensor_data(bg_ptr, id);



	if (IS_ERR(data))

	if (IS_ERR_OR_NULL(data))

		data = omap_thermal_build_data(bg_ptr, id);



	if (!data)
@@ -309,7 +309,7 @@ int omap_thermal_register_cpu_cooling(struct omap_bandgap *bg_ptr, int id) 
	struct omap_thermal_data *data;



	data = omap_bandgap_get_sensor_data(bg_ptr, id);

	if (IS_ERR(data))

	if (IS_ERR_OR_NULL(data))

		data = omap_thermal_build_data(bg_ptr, id);



	if (!data)