Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'acpi-3.11-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull ACPI fix from Rafael Wysocki:
"I really hoped that it wouldn't be necessary to change anything in
ACPI at this point, but it turns out that we need to revert one more
ACPI video commit causing trouble.
This reverts a change in the ACPI video driver that caused the ACPI
backlight initialization to be carried out even if acpi_backlight=vendor
is passed in the kernel command line which turns out to break things
at least on one system"
* tag 'acpi-3.11-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
Revert "ACPI / video: Always call acpi_video_init_brightness() on init"
+3
-8
+3
-8
drivers/acpi/video.c
+3
-8
drivers/acpi/video.c
···
908
908
device->cap._DDC = 1;
909
909
}
910
910
911
-
if (acpi_video_init_brightness(device))
912
-
return;
913
-
914
911
if (acpi_video_backlight_support()) {
915
912
struct backlight_properties props;
916
913
struct pci_dev *pdev;
···
917
920
static int count = 0;
918
921
char *name;
919
922
923
+
result = acpi_video_init_brightness(device);
924
+
if (result)
925
+
return;
920
926
name = kasprintf(GFP_KERNEL, "acpi_video%d", count);
921
927
if (!name)
922
928
return;
···
979
979
if (result)
980
980
printk(KERN_ERR PREFIX "Create sysfs link\n");
981
981
982
-
} else {
983
-
/* Remove the brightness object. */
984
-
kfree(device->brightness->levels);
985
-
kfree(device->brightness);
986
-
device->brightness = NULL;
987
982
}
988
983
}
989
984