Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ACPI / video: Always call acpi_video_init_brightness() on init

Browse source 
We have to call acpi_video_init_brightness() even if we're not going
to initialise the backlight - Thinkpads seem to use this as the
trigger for enabling ACPI notifications rather than handling it in
firmware.

[rjw: Drop the brightness object created by
 acpi_video_init_brightness() if we are not going to use it.]
Signed-off-by: Matthew Garrett <matthew.garrett@nebula.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
This commit is contained in:
Matthew Garrett 2013-07-16 17:08:16 +00:00 committed by Rafael J. Wysocki
parent 242b2287cd
commit c04c697cf1
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
drivers/acpi/video.c
View file

@ -898,6 +898,9 @@ static void acpi_video_device_find_cap(struct acpi_video_device *device)
device->cap._DDC = 1; device->cap._DDC = 1;
} }
if (acpi_video_init_brightness(device))
return;
if (acpi_video_backlight_support()) { if (acpi_video_backlight_support()) {
struct backlight_properties props; struct backlight_properties props;
struct pci_dev *pdev; struct pci_dev *pdev;
@ -907,9 +910,6 @@ static void acpi_video_device_find_cap(struct acpi_video_device *device)
static int count = 0; static int count = 0;
char *name; char *name;
result = acpi_video_init_brightness(device);
if (result)
return;
name = kasprintf(GFP_KERNEL, "acpi_video%d", count); name = kasprintf(GFP_KERNEL, "acpi_video%d", count);
if (!name) if (!name)
return; return;
@ -969,6 +969,11 @@ static void acpi_video_device_find_cap(struct acpi_video_device *device)
if (result) if (result)
printk(KERN_ERR PREFIX "Create sysfs link\n"); printk(KERN_ERR PREFIX "Create sysfs link\n");
} else {
/* Remove the brightness object. */
kfree(device->brightness->levels);
kfree(device->brightness);
device->brightness = NULL;
} }
} }