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

Commit ac6a98d4 authored by Cyril Roelandt's avatar Cyril Roelandt Committed by Greg Kroah-Hartman
Browse files

staging: omap-thermal: fix error check in omap_thermal_expose_sensor() and in... 


staging: omap-thermal: fix error check in omap_thermal_expose_sensor() and in omap_thermal_register_cpu_cooling().

The omap_bandgap_get_sensor_data() function returns ERR_PTR(), so we need to use
IS_ERR() rather than a NULL check.

Signed-off-by: default avatarCyril Roelandt <tipecaml@gmail.com>
Acked-by: default avatarEduardo Valentin <eduardo.valentin@ti.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent fd958f7e

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 (!data)

	if (IS_ERR(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 (!data)

	if (IS_ERR(data))

		data = omap_thermal_build_data(bg_ptr, id);



	if (!data)