summaryrefslogtreecommitdiffstats
path: root/include/acpi/video.h
diff options
context:
space:
mode:
authorAaron Lu <aaron.lu@intel.com>2016-05-21 15:30:46 +0800
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2016-05-30 13:53:09 +0200
commit9f9cd7ee2c05881f151e5ee4889e667a031dd8d9 (patch)
tree55c2c3702f9675afe8756c2bb9baa5bf7e127f42 /include/acpi/video.h
parente4f35c1339f0cfcf38d3f63dd6fea2b070399263 (diff)
downloadlinux-9f9cd7ee2c05881f151e5ee4889e667a031dd8d9.tar.gz
linux-9f9cd7ee2c05881f151e5ee4889e667a031dd8d9.tar.bz2
linux-9f9cd7ee2c05881f151e5ee4889e667a031dd8d9.zip
ACPI / Thermal / video: fix max_level incorrect value
commit 059500940def (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: 059500940def (ACPI/video: export acpi_video_get_levels) Reported-and-tested-by: Valdis Kletnieks <valdis.kletnieks@vt.edu> Signed-off-by: Aaron Lu <aaron.lu@intel.com> Acked-by: Zhang Rui <rui.zhang@intel.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'include/acpi/video.h')
-rw-r--r--include/acpi/video.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/include/acpi/video.h b/include/acpi/video.h
index 70a41f742037..5731ccb42585 100644
--- a/include/acpi/video.h
+++ b/include/acpi/video.h
@@ -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 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
static inline int acpi_video_register(void) { return 0; }
static inline void acpi_video_unregister(void) { return; }
@@ -72,7 +73,8 @@ static inline bool acpi_video_handles_brightness_key_presses(void)
return false;
}
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;
}