1 files changed, 5 insertions, 2 deletions

diff --git a/drivers/input/keyboard/tca8418_keypad.c b/drivers/input/keyboard/tca8418_keypad.c
index a34cc6714e5b..55c15304ddbc 100644
--- a/drivers/input/keyboard/tca8418_keypad.c
+++ b/drivers/input/keyboard/tca8418_keypad.c
@@ -288,8 +288,11 @@ static int tca8418_keypad_probe(struct i2c_client *client,
                 irq_is_gpio = pdata->irq_is_gpio;
         } else {
                 struct device_node *np = dev->of_node;
-                of_property_read_u32(np, "keypad,num-rows", &rows);
-                of_property_read_u32(np, "keypad,num-columns", &cols);
+                int err;
+
+                err = matrix_keypad_parse_of_params(dev, &rows, &cols);
+                if (err)
+                        return err;
                 rep = of_property_read_bool(np, "keypad,autorepeat");
         }