From 348456581fcaf35dbed7738ce33a35c7b50ab42e Mon Sep 17 00:00:00 2001 From: Thomas Renninger Date: Fri, 1 Aug 2008 17:38:02 +0200 Subject: [PATCH] --- yaml --- r: 118819 b: refs/heads/master c: 540b8bb9c33935183ceb5bed466a42ad72b2af56 h: refs/heads/master i: 118817: 834f1abe03b9fac4e173c4a5cd5def05a6c2a8be 118815: 468fc948cf9d13a911701a5acfec5ef3db163569 v: v3 --- [refs] | 2 +- trunk/drivers/misc/sony-laptop.c | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 65c876b2eedf..b75d49291d00 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a598c82f39892069a8f6693459b1179fd9ef30e1 +refs/heads/master: 540b8bb9c33935183ceb5bed466a42ad72b2af56 diff --git a/trunk/drivers/misc/sony-laptop.c b/trunk/drivers/misc/sony-laptop.c index 06f07e19dc70..7bcb81002dcf 100644 --- a/trunk/drivers/misc/sony-laptop.c +++ b/trunk/drivers/misc/sony-laptop.c @@ -1038,7 +1038,11 @@ static int sony_nc_add(struct acpi_device *device) goto outinput; } - if (ACPI_SUCCESS(acpi_get_handle(sony_nc_acpi_handle, "GBRT", &handle))) { + if (!acpi_video_backlight_support()) { + printk(KERN_INFO DRV_PFX "Sony: Brightness ignored, must be " + "controlled by ACPI video driver\n"); + } else if (ACPI_SUCCESS(acpi_get_handle(sony_nc_acpi_handle, "GBRT", + &handle))) { sony_backlight_device = backlight_device_register("sony", NULL, NULL, &sony_backlight_ops);