Commit 72c976fc authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

thermal: gov_user_space: Do not lock thermal zone mutex 



Commit 670a5e35 ("thermal/core: Move the thermal zone lock out of
the governors") moved thermal zone locking away from governors, but it
forgot about the user space one which deadlocks now.

Fix this by removing the thermal zone locking from the user space
governor.

Fixes: 670a5e35 ("thermal/core: Move the thermal zone lock out of the governors")
Tested-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 02af1db0

drivers/thermal/gov_user_space.c

+3 −2
Original line number Diff line number Diff line
@@ -34,7 +34,8 @@ static int notify_user_space(struct thermal_zone_device *tz, int trip) 
	char *thermal_prop[5];

	int i;



	mutex_lock(&tz->lock);

	lockdep_assert_held(&tz->lock);



	thermal_prop[0] = kasprintf(GFP_KERNEL, "NAME=%s", tz->type);

	thermal_prop[1] = kasprintf(GFP_KERNEL, "TEMP=%d", tz->temperature);

	thermal_prop[2] = kasprintf(GFP_KERNEL, "TRIP=%d", trip);
@@ -43,7 +44,7 @@ static int notify_user_space(struct thermal_zone_device *tz, int trip) 
	kobject_uevent_env(&tz->device.kobj, KOBJ_CHANGE, thermal_prop);

	for (i = 0; i < 4; ++i)

		kfree(thermal_prop[i]);

	mutex_unlock(&tz->lock);



	return 0;

}