Home Home > GIT Browse > SLE15-SP1-AZURE
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Bogendoerfer <tbogendoerfer@suse.de>2019-06-19 18:03:06 +0200
committerThomas Bogendoerfer <tbogendoerfer@suse.de>2019-06-19 18:03:49 +0200
commit08cc6e4701f20c2e62e6bc6236265519f93a73b8 (patch)
tree55dc153a78eac7b7790757fb499dc96ab3026671
parent30ec5451db5155b69099aed44616ef0a5a67d4d0 (diff)
platform/x86: mlx-platform: Fix copy-paste error in
mlxplat_init() (bsc#1112374).
-rw-r--r--patches.drivers/platform-x86-mlx-platform-Fix-copy-paste-error-in-ml.patch32
-rw-r--r--series.conf1
2 files changed, 33 insertions, 0 deletions
diff --git a/patches.drivers/platform-x86-mlx-platform-Fix-copy-paste-error-in-ml.patch b/patches.drivers/platform-x86-mlx-platform-Fix-copy-paste-error-in-ml.patch
new file mode 100644
index 0000000000..ba9ff3ec8c
--- /dev/null
+++ b/patches.drivers/platform-x86-mlx-platform-Fix-copy-paste-error-in-ml.patch
@@ -0,0 +1,32 @@
+From: Wei Yongjun <weiyongjun1@huawei.com>
+Date: Wed, 8 Aug 2018 04:00:30 +0000
+Subject: platform/x86: mlx-platform: Fix copy-paste error in mlxplat_init()
+Patch-mainline: v4.19-rc1
+Git-commit: 207da7128a6d61a1ce3d052b3dfb10d237af6078
+References: bsc#1112374
+
+The return value from platform_device_register_resndata() is not checked
+correctly. The test is done against a wrong variable. This patch fix it.
+
+Fixes: 0378123c5800 ("platform/x86: mlx-platform: Add mlxreg-fan platform driver activation")
+Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
+Acked-by: Vadim Pasternak <vadimp@mellanox.com>
+Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
+Acked-by: Thomas Bogendoerfer <tbogendoerfer@suse.de>
+---
+ drivers/platform/x86/mlx-platform.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/drivers/platform/x86/mlx-platform.c
++++ b/drivers/platform/x86/mlx-platform.c
+@@ -1704,8 +1704,8 @@ static int __init mlxplat_init(void)
+ PLATFORM_DEVID_NONE, NULL, 0,
+ mlxplat_fan,
+ sizeof(*mlxplat_fan));
+- if (IS_ERR(priv->pdev_io_regs)) {
+- err = PTR_ERR(priv->pdev_io_regs);
++ if (IS_ERR(priv->pdev_fan)) {
++ err = PTR_ERR(priv->pdev_fan);
+ goto fail_platform_io_regs_register;
+ }
+ }
diff --git a/series.conf b/series.conf
index 33b48b521e..03caddcfdb 100644
--- a/series.conf
+++ b/series.conf
@@ -39230,6 +39230,7 @@
patches.drivers/platform-x86-mlx-platform-Allow-mlxreg-io-driver-act.patch
patches.drivers/platform-x86-mlx-platform-Change-mlxreg-io-configura.patch
patches.drivers/platform-x86-mlx-platform-Remove-unused-define.patch
+ patches.drivers/platform-x86-mlx-platform-Fix-copy-paste-error-in-ml.patch
patches.drivers/platform-x86-asus-nb-wmi-Add-keymap-entry-for-lid-fl.patch
patches.arch/ARM-hwmod-RTC-Don-t-assume-lock-unlock-will-be-calle.patch
patches.arch/ARM-mvebu-declare-asm-symbols-as-character-arrays-in.patch