Merge "thermal-core: Fix invalid sensor request not accounted correctly" (6dd0b1ae) · Commits · e / devices / android_kernel_sony_msm8994

drivers/thermal/thermal_core.c

+5 −2

Original line number	Diff line number	Diff line
		@@ -137,16 +137,19 @@ static struct sensor_info *get_sensor(uint32_t sensor_id)

		list_for_each_entry_safe(pos, var, &sensor_info_list, sensor_list) {
		if (pos->sensor_id == sensor_id)
		break;
		return pos;
		}

		return pos;
		return NULL;
		}

		int sensor_get_id(char *name)
		{
		struct sensor_info pos, var;

		if (!name)
		return -ENODEV;

		list_for_each_entry_safe(pos, var, &sensor_info_list, sensor_list) {
		if (!strcmp(pos->tz->type, name))
		return pos->sensor_id;