Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMian Yousaf Kaukab <yousaf.kaukab@suse.com>2019-05-02 16:40:48 +0200
committerMian Yousaf Kaukab <yousaf.kaukab@suse.com>2019-05-03 11:20:54 +0200
commit04b0528eedb8cfd68d5385530a9424e5e8c11ae2 (patch)
tree49ba0c59f157572b132e9597088bfd32944d45c1
parentb01a150d890452099792ec9f1dffb2945ae14068 (diff)
ipmi_ssif: Remove duplicate NULL check (bsc#1108193).
-rw-r--r--patches.drivers/0002-ipmi_ssif-Remove-duplicate-NULL-check.patch37
-rw-r--r--series.conf1
2 files changed, 38 insertions, 0 deletions
diff --git a/patches.drivers/0002-ipmi_ssif-Remove-duplicate-NULL-check.patch b/patches.drivers/0002-ipmi_ssif-Remove-duplicate-NULL-check.patch
new file mode 100644
index 0000000000..65bd6b49f3
--- /dev/null
+++ b/patches.drivers/0002-ipmi_ssif-Remove-duplicate-NULL-check.patch
@@ -0,0 +1,37 @@
+From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
+Date: Tue, 31 Oct 2017 16:21:38 +0200
+Subject: ipmi_ssif: Remove duplicate NULL check
+
+Git-commit: e45af3d372f1d4339663dcbef28665f5b15d448c
+Patch-mainline: v4.16-rc1
+References: bsc#1108193
+
+Since i2c_unregister_device() became NULL-aware we may remove duplicate
+NULL check.
+
+Cc: Corey Minyard <minyard@acm.org>
+Cc: openipmi-developer@lists.sourceforge.net
+Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
+Signed-off-by: Corey Minyard <cminyard@mvista.com>
+Signed-off-by: Mian Yousaf Kaukab <yousaf.kaukab@suse.com>
+---
+ drivers/char/ipmi/ipmi_ssif.c | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/drivers/char/ipmi/ipmi_ssif.c b/drivers/char/ipmi/ipmi_ssif.c
+index 3cfaec728604..f929e72bdac8 100644
+--- a/drivers/char/ipmi/ipmi_ssif.c
++++ b/drivers/char/ipmi/ipmi_ssif.c
+@@ -2071,8 +2071,7 @@ static int ssif_platform_remove(struct platform_device *dev)
+ return 0;
+
+ mutex_lock(&ssif_infos_mutex);
+- if (addr_info->client)
+- i2c_unregister_device(addr_info->client);
++ i2c_unregister_device(addr_info->client);
+
+ list_del(&addr_info->link);
+ kfree(addr_info);
+--
+2.11.0
+
diff --git a/series.conf b/series.conf
index abd4e180bd..bf9ac73ce4 100644
--- a/series.conf
+++ b/series.conf
@@ -12225,6 +12225,7 @@
patches.drivers/power-supply-axp288_charger-Properly-stop-work-on-pr
patches.drivers/ipmi-use-dynamic-memory-for-DMI-driver-override.patch
patches.suse/ipmi-powernv-Fix-error-return-code-in-ipmi_powernv_p.patch
+ patches.drivers/0002-ipmi_ssif-Remove-duplicate-NULL-check.patch
patches.fixes/0001-HID-multitouch-Only-look-at-non-touch-fields-in-firs.patch
patches.drivers/HID-add-quirk-for-another-PIXART-OEM-mouse-used-by-H.patch
patches.fixes/0001-HID-quirks-Fix-keyboard-touchpad-on-Toshiba-Click-Mi.patch