Merge tag 'hsi-for-5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi

[linux-2.6-microblaze.git] / drivers / input / matrix-keymap.c

diff --git a/drivers/input/matrix-keymap.c b/drivers/input/matrix-keymap.c
index da312be..4fa5342 100644 (file)
--- a/drivers/input/matrix-keymap.c
+++ b/drivers/input/matrix-keymap.c
@@ -81,7 +81,7 @@ static int matrix_keypad_parse_keymap(const char *propname,
        if (!propname)
                propname = "linux,keymap";
 
-       size = device_property_read_u32_array(dev, propname, NULL, 0);
+       size = device_property_count_u32(dev, propname);
        if (size <= 0) {
                dev_err(dev, "missing or malformed property %s: %d\n",
                        propname, size);