rpms/kernel/devel linux-2.6.27-sony-laptop-suspend-fix.patch, NONE, 1.1 TODO, 1.22, 1.23 kernel.spec, 1.1059, 1.1060

[Adam Jackson]

Author: ajax

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32106

Modified Files:
	TODO kernel.spec 
Added Files:
	linux-2.6.27-sony-laptop-suspend-fix.patch 
Log Message:
* Fri Oct 17 2008 Adam Jackson <ajax at redhat.com> 2.6.27.2-23.rc1
- Fix suspend on newer Vaios


linux-2.6.27-sony-laptop-suspend-fix.patch:

--- NEW FILE linux-2.6.27-sony-laptop-suspend-fix.patch ---
>From 5eca50f39d16cfcd565c83ef42e83ef7f80a1c65 Mon Sep 17 00:00:00 2001
From: Matthew Garrett <mjg59 at srcf.ucam.org>
Date: Thu, 16 Oct 2008 17:26:20 -0400
Subject: [PATCH] sony-laptop: Ignore missing _DIS method on pic device

At least the Vaio VGN-Z540N doesn't have this method, so let's not fail
to suspend just because it doesn't exist.

Signed-off-by: Adam Jackson <ajax at redhat.com>
---
 drivers/misc/sony-laptop.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/misc/sony-laptop.c b/drivers/misc/sony-laptop.c
index 60775be..b35eb92 100644
--- a/drivers/misc/sony-laptop.c
+++ b/drivers/misc/sony-laptop.c
@@ -2315,8 +2315,10 @@ end:
  */
 static int sony_pic_disable(struct acpi_device *device)
 {
-	if (ACPI_FAILURE(acpi_evaluate_object(device->handle,
-			"_DIS", NULL, NULL)))
+	acpi_status ret = acpi_evaluate_object(device->handle, "_DIS", NULL,
+					       NULL);
+
+	if (ACPI_FAILURE(ret) && ret != AE_NOT_FOUND)
 		return -ENXIO;
 
 	dprintk("Device disabled\n");
-- 
1.6.0.1



Index: TODO
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/TODO,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- TODO	17 Oct 2008 13:41:59 -0000	1.22
+++ TODO	17 Oct 2008 13:48:50 -0000	1.23
@@ -165,3 +165,6 @@
 linux-2.6-x86-register-platform-rtc-if-pnp-doesnt-describe-it.patch
 	Fix broken RTC on systems that don't expose it via PnP.
 	Should probably be in -stable but needs some testing.
+
+linux-2.6.27-sony-laptop-suspend-fix.patch
+	Submitted: http://marc.info/?l=linux-kernel&m=122419261829835&w=2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1059
retrieving revision 1.1060
diff -u -r1.1059 -r1.1060
--- kernel.spec	16 Oct 2008 23:55:38 -0000	1.1059
+++ kernel.spec	17 Oct 2008 13:48:50 -0000	1.1060
@@ -698,6 +698,9 @@
 Patch3010: linux-2.6-rtc-cmos-look-for-pnp-rtc-first.patch
 Patch3020: linux-2.6-x86-register-platform-rtc-if-pnp-doesnt-describe-it.patch
 
+# Sony Vaio suspend fix
+Patch3100: linux-2.6.27-sony-laptop-suspend-fix.patch
+
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1241,6 +1244,9 @@
 # get rid of imacfb and make efifb work everywhere it was used
 ApplyPatch linux-2.6-merge-efifb-imacfb.patch
 
+# Sony Vaio suspend fix
+ApplyPatch linux-2.6.27-sony-laptop-suspend-fix.patch
+
 # silence piix3 in quiet boot (ie, qemu)
 ApplyPatch linux-2.6-piix3-silence-quirk.patch
 # Hush IOMMU warnings, you typically can't fix them anyway
@@ -1825,6 +1831,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Fri Oct 17 2008 Adam Jackson <ajax at redhat.com> 2.6.27.2-23.rc1
+- Fix suspend on newer Vaios
+
 * Thu Oct 16 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.27.2-22.rc1
 - Linux 2.6.27.2-rc1
   Dropped patches: