summaryrefslogtreecommitdiffstats
path: root/drivers/input
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2020-12-15 17:41:16 -0800
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2020-12-15 17:43:00 -0800
commit1e2020aa0da00051d94c4690c023c45d8f3834bd (patch)
treefb8bd071af8b12dbe1a7f6ef83b74ac397e846ce /drivers/input
parent92f0a3a22c7a4c936277ece3a0215955a2d52238 (diff)
downloadlinux-stable-1e2020aa0da00051d94c4690c023c45d8f3834bd.tar.gz
linux-stable-1e2020aa0da00051d94c4690c023c45d8f3834bd.tar.bz2
linux-stable-1e2020aa0da00051d94c4690c023c45d8f3834bd.zip
Input: da7280 - fix missing error test
An "if" testing for error condition has accidentally been dropped from the code. Reported-by: kernel test robot <lkp@intel.com> Fixes: cd3f609823a5 ("Input: new da7280 haptic driver") Reviewed-by: Roy Im <Roy.Im.Opensource@diasemi.com> Link: https://lore.kernel.org/r/X9j8lGFgijzHyYZZ@google.com Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers/input')
-rw-r--r--drivers/input/misc/da7280.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/input/misc/da7280.c b/drivers/input/misc/da7280.c
index 37568b00873d..2f698a8c1d65 100644
--- a/drivers/input/misc/da7280.c
+++ b/drivers/input/misc/da7280.c
@@ -863,6 +863,7 @@ static void da7280_parse_properties(struct device *dev,
gpi_str3[7] = '0' + i;
haptics->gpi_ctl[i].polarity = 0;
error = device_property_read_string(dev, gpi_str3, &str);
+ if (!error)
haptics->gpi_ctl[i].polarity =
da7280_haptic_of_gpi_pol_str(dev, str);
}