]>
Commit | Line | Data |
---|---|---|
00e5a55c BS |
1 | From: Thomas Renninger <trenn@suse.de> |
2 | Subject: [PATCH] sony-laptop: fingers off backlight if video.ko is serving this functionality | |
3 | Patch-Mainline: queued for .28 in Len's/ak's ACPI tree | |
4 | ||
5 | commit 1d38a0697573617e7f4d184207cced6cbe8d54d5 | |
6 | ||
7 | Signed-off-by: Thomas Renninger <trenn@suse.de> | |
8 | Signed-off-by: Andi Kleen <ak@linux.intel.com> | |
9 | --- | |
10 | drivers/misc/sony-laptop.c | 6 +++++- | |
11 | 1 files changed, 5 insertions(+), 1 deletions(-) | |
12 | ||
13 | diff --git a/drivers/misc/sony-laptop.c b/drivers/misc/sony-laptop.c | |
14 | index 60775be..3d178ab 100644 | |
15 | --- a/drivers/misc/sony-laptop.c | |
16 | +++ b/drivers/misc/sony-laptop.c | |
17 | @@ -1038,7 +1038,11 @@ static int sony_nc_add(struct acpi_device *device) | |
18 | goto outinput; | |
19 | } | |
20 | ||
21 | - if (ACPI_SUCCESS(acpi_get_handle(sony_nc_acpi_handle, "GBRT", &handle))) { | |
22 | + if (acpi_video_backlight_support()) { | |
23 | + printk(KERN_INFO DRV_PFX "Sony: Brightness ignored, must be " | |
24 | + "controlled by ACPI video driver\n"); | |
25 | + } else if (ACPI_SUCCESS(acpi_get_handle(sony_nc_acpi_handle, "GBRT", | |
26 | + &handle))) { | |
27 | sony_backlight_device = backlight_device_register("sony", NULL, | |
28 | NULL, | |
29 | &sony_backlight_ops); | |
30 | -- | |
31 | 1.5.4.5 | |
32 |