[kernel] r18967 - in dists/trunk/linux-2.6/debian: . patches/bugfix/x86 patches/series

[Ben Hutchings]

Author: benh
Date: Tue May  1 00:23:51 2012
New Revision: 18967

Log:
[x86] dell-laptop: Terminate quirks list properly

Added:
   dists/trunk/linux-2.6/debian/patches/bugfix/x86/dell-laptop-terminate-quirks-list-properly.patch
Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/patches/series/base

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	Mon Apr 30 03:13:29 2012	(r18966)
+++ dists/trunk/linux-2.6/debian/changelog	Tue May  1 00:23:51 2012	(r18967)
@@ -4,6 +4,9 @@
     http://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.3.3
     http://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.3.4
 
+  [ Ben Hutchings ]
+  * [x86] dell-laptop: Terminate quirks list properly
+
  -- Ben Hutchings <ben at decadent.org.uk>  Mon, 30 Apr 2012 04:02:33 +0100
 
 linux-2.6 (3.3.2-1~experimental.1) experimental; urgency=low

Added: dists/trunk/linux-2.6/debian/patches/bugfix/x86/dell-laptop-terminate-quirks-list-properly.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/trunk/linux-2.6/debian/patches/bugfix/x86/dell-laptop-terminate-quirks-list-properly.patch	Tue May  1 00:23:51 2012	(r18967)
@@ -0,0 +1,32 @@
+From d62d421b071b08249361044d8e56c8b5c3ed6aa7 Mon Sep 17 00:00:00 2001
+From: Martin Nyhus <martin.nyhus at gmx.com>
+Date: Thu, 15 Mar 2012 18:25:48 +0100
+Subject: dell-laptop: Terminate quirks list properly
+
+From: Martin Nyhus <martin.nyhus at gmx.com>
+
+commit d62d421b071b08249361044d8e56c8b5c3ed6aa7 upstream.
+
+Add missing DMI_NONE entry to end of the quirks list so
+dmi_check_system() won't read past the end of the list.
+
+Signed-off-by: Martin Nyhus <martin.nyhus at gmx.com>
+Signed-off-by: Matthew Garrett <mjg at redhat.com>
+Cc: Guenter Roeck <guenter.roeck at ericsson.com>
+Tested-by: Jens Gustedt <Jens.Gustedt at loria.fr>
+Signed-off-by: Greg Kroah-Hartman <gregkh at linuxfoundation.org>
+
+---
+ drivers/platform/x86/dell-laptop.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/drivers/platform/x86/dell-laptop.c
++++ b/drivers/platform/x86/dell-laptop.c
+@@ -211,6 +211,7 @@ static struct dmi_system_id __devinitdat
+ 		},
+ 		.driver_data = &quirk_dell_vostro_v130,
+ 	},
++	{ }
+ };
+ 
+ static struct calling_interface_buffer *buffer;

Modified: dists/trunk/linux-2.6/debian/patches/series/base
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/base	Mon Apr 30 03:13:29 2012	(r18966)
+++ dists/trunk/linux-2.6/debian/patches/series/base	Tue May  1 00:23:51 2012	(r18967)
@@ -110,3 +110,4 @@
 + bugfix/x86/drm-i915-fix-integer-overflow-in-i915_gem_execbuffer2.patch
 + bugfix/x86/drm-i915-fix-integer-overflow-in-i915_gem_do_execbuffer.patch
 + bugfix/all/revert-autofs-work-around-unhappy-compat-problem-on-.patch
++ bugfix/x86/dell-laptop-terminate-quirks-list-properly.patch