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

Commit ffcf4c40 authored by Fenglin Wu's avatar Fenglin Wu
Browse files

hwmon: qpnp-adc-voltage: Assign vadc_dev before registering TZ 



The vadc_dev is used in qpnp_vadc_read() when registering the thermal
zone device. The NULL value would cause the qpnp_vadc_read() failed by
returning -EPROBE_DEFER or cause a kernel crash.

Change-Id: I47b88da9dc39bd3df8678a734206b29912b83718
Signed-off-by: default avatarFenglin Wu <fenglinw@codeaurora.org>
parent 13848461

drivers/hwmon/qpnp-adc-voltage.c

+1 −1
Original line number Diff line number Diff line
@@ -2227,6 +2227,7 @@ static int32_t qpnp_vadc_init_thermal(struct qpnp_vadc_chip *vadc, 
			vadc->vadc_therm_chan[i].thermal_node = true;

			snprintf(name, sizeof(name), "%s",

				vadc->adc->adc_channels[i].name);

			vadc->vadc_therm_chan[i].vadc_dev = vadc;

			vadc->vadc_therm_chan[i].tz_dev =

				thermal_zone_device_register(name,

				0, 0, &vadc->vadc_therm_chan[i],
@@ -2235,7 +2236,6 @@ static int32_t qpnp_vadc_init_thermal(struct qpnp_vadc_chip *vadc, 
				pr_err("thermal device register failed.\n");

				goto thermal_err_sens;

			}

			vadc->vadc_therm_chan[i].vadc_dev = vadc;

		}

		i++;

		thermal_node = false;