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

Commit 9f9cd7ee authored by Aaron Lu's avatar Aaron Lu Committed by Rafael J. Wysocki
Browse files

ACPI / Thermal / video: fix max_level incorrect value 



commit 05950094 (ACPI/video: export acpi_video_get_levels)
mistakenly dropped the correct value of max_level and that caused the
set_level function following failed and the acpi_video backlight interface
didn't get created. Fix this by passing back the correct max_level value.

While at it, also fix the param used in acpi_video_device_lcd_query_levels
where acpi_handle is expected but acpi_video_device is passed.

Fixes: 05950094 (ACPI/video: export acpi_video_get_levels)
Reported-and-tested-by: default avatarValdis Kletnieks <valdis.kletnieks@vt.edu>
Signed-off-by: default avatarAaron Lu <aaron.lu@intel.com>
Acked-by: default avatarZhang Rui <rui.zhang@intel.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent e4f35c13

drivers/acpi/acpi_video.c

+6 −3
Original line number Original line Diff line number Diff line
@@ -754,7 +754,8 @@ static int acpi_video_bqc_quirk(struct acpi_video_device *device, 
}

}





int acpi_video_get_levels(struct acpi_device *device,

int acpi_video_get_levels(struct acpi_device *device,

			  struct acpi_video_device_brightness **dev_br)

			  struct acpi_video_device_brightness **dev_br,

			  int *pmax_level)

{

{

	union acpi_object *obj = NULL;

	union acpi_object *obj = NULL;

	int i, max_level = 0, count = 0, level_ac_battery = 0;

	int i, max_level = 0, count = 0, level_ac_battery = 0;
@@ -841,6 +842,8 @@ int acpi_video_get_levels(struct acpi_device *device, 




	br->count = count;

	br->count = count;

	*dev_br = br;

	*dev_br = br;

	if (pmax_level)

		*pmax_level = max_level;





out:

out:

	kfree(obj);

	kfree(obj);
@@ -869,7 +872,7 @@ acpi_video_init_brightness(struct acpi_video_device *device) 
	struct acpi_video_device_brightness *br = NULL;

	struct acpi_video_device_brightness *br = NULL;

	int result = -EINVAL;

	int result = -EINVAL;





	result = acpi_video_get_levels(device->dev, &br);

	result = acpi_video_get_levels(device->dev, &br, &max_level);

	if (result)

	if (result)

		return result;

		return result;

	device->brightness = br;

	device->brightness = br;
@@ -1737,7 +1740,7 @@ static void acpi_video_run_bcl_for_osi(struct acpi_video_bus *video) 




	mutex_lock(&video->device_list_lock);

	mutex_lock(&video->device_list_lock);

	list_for_each_entry(dev, &video->video_device_list, entry) {

	list_for_each_entry(dev, &video->video_device_list, entry) {

		if (!acpi_video_device_lcd_query_levels(dev, &levels))

		if (!acpi_video_device_lcd_query_levels(dev->dev->handle, &levels))

			kfree(levels);

			kfree(levels);

	}

	}

	mutex_unlock(&video->device_list_lock);

	mutex_unlock(&video->device_list_lock);

drivers/thermal/int340x_thermal/int3406_thermal.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -177,7 +177,7 @@ static int int3406_thermal_probe(struct platform_device *pdev) 
		return -ENODEV;

		return -ENODEV;

	d->raw_bd = bd;

	d->raw_bd = bd;





	ret = acpi_video_get_levels(ACPI_COMPANION(&pdev->dev), &d->br);

	ret = acpi_video_get_levels(ACPI_COMPANION(&pdev->dev), &d->br, NULL);

	if (ret)

	if (ret)

		return ret;

		return ret;

include/acpi/video.h

+4 −2
Original line number Original line Diff line number Diff line
@@ -51,7 +51,8 @@ extern void acpi_video_set_dmi_backlight_type(enum acpi_backlight_type type); 
 */

 */

extern bool acpi_video_handles_brightness_key_presses(void);

extern bool acpi_video_handles_brightness_key_presses(void);

extern int acpi_video_get_levels(struct acpi_device *device,

extern int acpi_video_get_levels(struct acpi_device *device,

				 struct acpi_video_device_brightness **dev_br);

				 struct acpi_video_device_brightness **dev_br,

				 int *pmax_level);

#else

#else

static inline int acpi_video_register(void) { return 0; }

static inline int acpi_video_register(void) { return 0; }

static inline void acpi_video_unregister(void) { return; }

static inline void acpi_video_unregister(void) { return; }
@@ -72,7 +73,8 @@ static inline bool acpi_video_handles_brightness_key_presses(void) 
	return false;

	return false;

}

}

static inline int acpi_video_get_levels(struct acpi_device *device,

static inline int acpi_video_get_levels(struct acpi_device *device,

			struct acpi_video_device_brightness **dev_br)

			struct acpi_video_device_brightness **dev_br,

			int *pmax_level)

{

{

	return -ENODEV;

	return -ENODEV;

}

}