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

Commit 1522f9c7 authored by Martin Andersson's avatar Martin Andersson Committed by Alex Deucher
Browse files

drm/radeon/dpm: Fix hwmon crash 

Commit ec39f64b (drm/radeon/dpm: Convert
to use devm_hwmon_register_with_groups) converted one usage of
dev_get_drvdata, but there were two more.

bug:
https://bugs.freedesktop.org/show_bug.cgi?id=72457



Signed-off-by: default avatarMartin Andersson <g02maran@gmail.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 8333f0fe

drivers/gpu/drm/radeon/radeon_pm.c

+2 −4
Original line number Diff line number Diff line
@@ -552,8 +552,7 @@ static ssize_t radeon_hwmon_show_temp_thresh(struct device *dev, 
					     struct device_attribute *attr,

					     char *buf)

{

	struct drm_device *ddev = dev_get_drvdata(dev);

	struct radeon_device *rdev = ddev->dev_private;

	struct radeon_device *rdev = dev_get_drvdata(dev);

	int hyst = to_sensor_dev_attr(attr)->index;

	int temp;
@@ -580,8 +579,7 @@ static umode_t hwmon_attributes_visible(struct kobject *kobj, 
					struct attribute *attr, int index)

{

	struct device *dev = container_of(kobj, struct device, kobj);

	struct drm_device *ddev = dev_get_drvdata(dev);

	struct radeon_device *rdev = ddev->dev_private;

	struct radeon_device *rdev = dev_get_drvdata(dev);



	/* Skip limit attributes if DPM is not enabled */

	if (rdev->pm.pm_method != PM_METHOD_DPM &&