rpms
/
kernel
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix ACPI video after _DOD errors (rhbz 869383)

This commit is contained in:
Josh Boyer 2012-11-26 14:15:41 -05:00
parent 1380ea091c
commit 418011b505
2 changed files with 52 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
ACPI-video-Ignore-errors-after-_DOD-evaluation.patch Normal file
View File

@ -0,0 +1,45 @@
From fba4e087361605d1eed63343bb08811f097c83ee Mon Sep 17 00:00:00 2001
From: Igor Murzov <e-mail@date.by>
Date: Sat, 13 Oct 2012 04:41:25 +0400
Subject: [PATCH] ACPI video: Ignore errors after _DOD evaluation.
There are systems where video module known to work fine regardless
of broken _DOD and ignoring returned value here doesn't cause
any issues later. This should fix brightness controls on some laptops.
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=47861
Signed-off-by: Igor Murzov <e-mail@date.by>
Reviewed-by: Sergey V <sftp.mtuci@gmail.com>
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
---
drivers/acpi/video.c | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
index f94d4c8..0230cb6 100644
--- a/drivers/acpi/video.c
+++ b/drivers/acpi/video.c
@@ -1345,12 +1345,15 @@ static int
acpi_video_bus_get_devices(struct acpi_video_bus *video,
struct acpi_device *device)
{
- int status;
+ int status = 0;
struct acpi_device *dev;
- status = acpi_video_device_enumerate(video);
- if (status)
- return status;
+ /*
+ * There are systems where video module known to work fine regardless
+ * of broken _DOD and ignoring returned value here doesn't cause
+ * any issues later.
+ */
+ acpi_video_device_enumerate(video);
list_for_each_entry(dev, &device->children, node) {
--
1.8.0

7
kernel.spec
View File

@ -792,6 +792,9 @@ Patch21229: exec-use-eloop-for-max-recursion-depth.patch
#rhbz 869629
Patch21230: SCSI-mvsas-Fix-oops-when-ata-commond-timeout.patch
#rhbz 869383
Patch21231: ACPI-video-Ignore-errors-after-_DOD-evaluation.patch
# END OF PATCH DEFINITIONS
%endif
@ -1538,6 +1541,9 @@ ApplyPatch exec-use-eloop-for-max-recursion-depth.patch
#rhbz 869629
ApplyPatch SCSI-mvsas-Fix-oops-when-ata-commond-timeout.patch
#rhbz 869383
ApplyPatch ACPI-video-Ignore-errors-after-_DOD-evaluation.patch
# END OF PATCH APPLICATIONS
%endif
@ -2402,6 +2408,7 @@ fi
# '-'
%changelog
* Mon Nov 26 2012 Josh Boyer <jwboyer@redhat.com>
- Fix ACPI video after _DOD errors (rhbz 869383)
- Fix ata command timeout oops in mvsas (rhbz 869629)
- Enable CONFIG_UIO_PDRV on ppc64 (rhbz 878180)
- CVE-2012-4530: stack disclosure binfmt_script load_script (rhbz 868285 880147)