r1048 - trunk/kernel-2.4/source/kernel-source-2.4.26-2.4.26/debian/patches

[Simon Horman]

Author: horms
Date: 2004-08-12 18:27:20 -0600 (Thu, 12 Aug 2004)
New Revision: 1048

Modified:
   trunk/kernel-2.4/source/kernel-source-2.4.26-2.4.26/debian/patches/patch-2.4.26-6
Log:
ASUS ACPI patch was reversed

Modified: trunk/kernel-2.4/source/kernel-source-2.4.26-2.4.26/debian/patches/patch-2.4.26-6
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.26-2.4.26/debian/patches/patch-2.4.26-6	2004-08-13 00:03:24 UTC (rev 1047)
+++ trunk/kernel-2.4/source/kernel-source-2.4.26-2.4.26/debian/patches/patch-2.4.26-6	2004-08-13 00:27:20 UTC (rev 1048)
@@ -4758,20 +4758,24 @@
 # *** Incorporated into patch for ChangeSet 1.1465 above - Horms 2004/08/12 ***
 # 
 
-# Device mapper merged in from devmapper-1.00.19
+# Reverse bogus patch
 # Horms 2004/08/12
---- a/drivers/acpi/asus_acpi.c.orig	2004-08-12 12:39:49.000000000 +0900
-+++ b/drivers/acpi/asus_acpi.c	2004-08-12 10:21:11.000000000 +0900
-@@ -403,7 +403,8 @@
+
+--- a/drivers/acpi/asus_acpi.c.orig	2004-08-12 17:35:40.000000000 +0900
++++ b/drivers/acpi/asus_acpi.c	2004-08-12 17:36:24.000000000 +0900
+@@ -403,8 +403,7 @@
  	if (copy_from_user(s, buf, count))
  		return -EFAULT;
  	s[count] = 0;
--	if (sscanf(s, "%i", val) != 1)
-+	count = parse_arg(buffer, count, &value);
-+	if (count > 0)
+-	count = parse_arg(buffer, count, &value);
+-	if (count > 0)
++	if (sscanf(s, "%i", val) != 1)
  		return -EINVAL;
  	return count;
  }
+
+# Device mapper merged in from devmapper-1.00.19
+# Horms 2004/08/12
 --- kernel-source-2.4.26-2.4.26/MAINTAINERS	2004-08-12 14:04:29.000000000 +0900
 +++ kernel-source-2.4.26-2.4.26.devmap/MAINTAINERS	2004-08-12 13:57:11.000000000 +0900
 @@ -589,9 +589,9 @@