Commit 8495e9c4a9616c9d19f23182d0536485902259db
Exists in
smarc-imx_3.14.28_1.0.0_ga
and in
1 other branch
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"
Showing 1 changed file Side-by-side Diff
drivers/acpi/video.c
| ... | ... | @@ -908,9 +908,6 @@ |
| 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; |
| ... | ... | @@ -920,6 +917,9 @@ |
| 920 | 917 | static int count = 0; |
| 921 | 918 | char *name; |
| 922 | 919 | |
| 920 | + result = acpi_video_init_brightness(device); | |
| 921 | + if (result) | |
| 922 | + return; | |
| 923 | 923 | name = kasprintf(GFP_KERNEL, "acpi_video%d", count); |
| 924 | 924 | if (!name) |
| 925 | 925 | return; |
| ... | ... | @@ -979,11 +979,6 @@ |
| 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 |