Input: edt-ft5x06 - fix get_default register write access

BugLink: https://bugs.launchpad.net/bugs/1885322
[ Upstream commit 255cdaf73412de13608fb776101402dca68bed2b ]

Since commit b6eba86030bf ("Input: edt-ft5x06 - add offset support for
ev-ft5726") offset-x and offset-y is supported. Devices using those
offset parameters don't support the offset parameter so we need to add
the NO_REGISTER check for edt_ft5x06_ts_get_defaults().

Fixes: b6eba86030bf ("Input: edt-ft5x06 - add offset support for ev-ft5726")
Signed-off-by: Marco Felsch <m.felsch@pengutronix.de>
Link: https://lore.kernel.org/r/20200227112819.16754-2-m.felsch@pengutronix.de
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Kelsey Skunberg <kelsey.skunberg@canonical.com>

diff --git a/drivers/input/touchscreen/edt-ft5x06.c b/drivers/input/touchscreen/edt-ft5x06.c
index 240e8de24cd24b409284357ec7fb898555de16e2..b41b97c962edc9efbf2d766560f4c50af99f9d64 100644 (file)
--- a/drivers/input/touchscreen/edt-ft5x06.c
+++ b/drivers/input/touchscreen/edt-ft5x06.c
@@ -935,19 +935,25 @@ static void edt_ft5x06_ts_get_defaults(struct device *dev,
 
        error = device_property_read_u32(dev, "offset", &val);
        if (!error) {
-               edt_ft5x06_register_write(tsdata, reg_addr->reg_offset, val);
+               if (reg_addr->reg_offset != NO_REGISTER)
+                       edt_ft5x06_register_write(tsdata,
+                                                 reg_addr->reg_offset, val);
                tsdata->offset = val;
        }
 
        error = device_property_read_u32(dev, "offset-x", &val);
        if (!error) {
-               edt_ft5x06_register_write(tsdata, reg_addr->reg_offset_x, val);
+               if (reg_addr->reg_offset_x != NO_REGISTER)
+                       edt_ft5x06_register_write(tsdata,
+                                                 reg_addr->reg_offset_x, val);
                tsdata->offset_x = val;
        }
 
        error = device_property_read_u32(dev, "offset-y", &val);
        if (!error) {
-               edt_ft5x06_register_write(tsdata, reg_addr->reg_offset_y, val);
+               if (reg_addr->reg_offset_y != NO_REGISTER)
+                       edt_ft5x06_register_write(tsdata,
+                                                 reg_addr->reg_offset_y, val);
                tsdata->offset_y = val;
        }
 }