[linux] 04/07: [x86] pinctrl: cherryview: Add terminate entry for dmi_system_id tables

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

benh pushed a commit to branch stretch
in repository linux.

commit 4fe252353718459335e9c9dbdccc838b0a8fb993
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Mon Jul 17 00:33:12 2017 +0100

    [x86] pinctrl: cherryview: Add terminate entry for dmi_system_id tables
    
    Fixes regression introduced by first attempt at fixing #862723.
---
 debian/changelog                                   |  1 +
 ...rryview-add-terminate-entry-for-dmi_syste.patch | 28 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 30 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 80f15a1..10acafa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ linux (4.9.30-3) UNRELEASED; urgency=medium
   * [arm64] sound: Enable SND_HDA_INTEL as module (Closes: #867611)
   * [x86] ideapad-laptop: Add various IdeaPad models to no_hw_rfkill list
     (Closes: #866706)
+  * [x86] pinctrl: cherryview: Add terminate entry for dmi_system_id tables
 
  -- Ben Hutchings <ben at decadent.org.uk>  Sun, 16 Jul 2017 21:54:09 +0100
 
diff --git a/debian/patches/bugfix/x86/pinctrl-cherryview-add-terminate-entry-for-dmi_syste.patch b/debian/patches/bugfix/x86/pinctrl-cherryview-add-terminate-entry-for-dmi_syste.patch
new file mode 100644
index 0000000..082c086
--- /dev/null
+++ b/debian/patches/bugfix/x86/pinctrl-cherryview-add-terminate-entry-for-dmi_syste.patch
@@ -0,0 +1,28 @@
+From: Wei Yongjun <weiyongjun1 at huawei.com>
+Date: Tue, 25 Apr 2017 06:22:05 +0000
+Subject: pinctrl: cherryview: Add terminate entry for dmi_system_id tables
+Origin: https://git.kernel.org/linus/a9de080bbcd5c4e213a3d7bbb1e314d60980e943
+
+Make sure dmi_system_id tables are NULL terminated.
+
+Fixes: 703650278372 ("pinctrl: cherryview: Add a quirk to make Acer
+Chromebook keyboard work again")
+Signed-off-by: Wei Yongjun <weiyongjun1 at huawei.com>
+Acked-by: Mika Westerberg <mika.westerberg at linux.intel.com>
+Signed-off-by: Linus Walleij <linus.walleij at linaro.org>
+---
+ drivers/pinctrl/intel/pinctrl-cherryview.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- a/drivers/pinctrl/intel/pinctrl-cherryview.c
++++ b/drivers/pinctrl/intel/pinctrl-cherryview.c
+@@ -1542,7 +1542,8 @@ static const struct dmi_system_id chv_no
+ 			DMI_MATCH(DMI_PRODUCT_NAME, "Edgar"),
+ 			DMI_MATCH(DMI_BIOS_DATE, "05/21/2016"),
+ 		},
+-	}
++	},
++	{}
+ };
+ 
+ static int chv_gpio_probe(struct chv_pinctrl *pctrl, int irq)
diff --git a/debian/patches/series b/debian/patches/series
index 44e51c2..d131df9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -54,6 +54,7 @@ debian/amd64-don-t-warn-about-expected-w+x-pages-on-xen.patch
 # Arch bug fixes
 bugfix/arm/arm-dts-kirkwood-fix-sata-pinmux-ing-for-ts419.patch
 bugfix/x86/pinctrl-cherryview-add-a-quirk-to-make-acer-chromebo.patch
+bugfix/x86/pinctrl-cherryview-add-terminate-entry-for-dmi_syste.patch
 bugfix/x86/platform-x86-ideapad-laptop-add-y700-15-acz-to-no_hw.patch
 bugfix/x86/platform-x86-ideapad-laptop-add-ideapad-310-15ikb-to.patch
 bugfix/x86/platform-x86-ideapad-laptop-add-ideapad-v310-15isk-t.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git