Input: edt-ft5x06 - fix get_default register write access
authorMarco Felsch <m.felsch@pengutronix.de>
Sat, 9 May 2020 21:34:35 +0000 (14:34 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Sat, 9 May 2020 21:39:35 +0000 (14:39 -0700)
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>
drivers/input/touchscreen/edt-ft5x06.c

index d2587724c52ada7256bec4da1dcd96798dedbf8f..9b8450794a8a26735d698f119299e30e08013bc6 100644 (file)
@@ -938,19 +938,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;
        }
 }