Merge tag 'v3.19-rc4' into next

[firefly-linux-kernel-4.4.55.git] / drivers / input / keyboard / imx_keypad.c

diff --git a/drivers/input/keyboard/imx_keypad.c b/drivers/input/keyboard/imx_keypad.c
index e53f232eda0ece0a97fdacb47714aaaa8c09b537..2e855e6f3565cffe0644922445581dec92c00914 100644 (file)
--- a/drivers/input/keyboard/imx_keypad.c
+++ b/drivers/input/keyboard/imx_keypad.c
@@ -448,8 +448,7 @@ static int imx_keypad_probe(struct platform_device *pdev)
                return -ENOMEM;
        }
 
-       keypad = devm_kzalloc(&pdev->dev, sizeof(struct imx_keypad),
-                             GFP_KERNEL);
+       keypad = devm_kzalloc(&pdev->dev, sizeof(*keypad), GFP_KERNEL);
        if (!keypad) {
                dev_err(&pdev->dev, "not enough memory for driver data\n");
                return -ENOMEM;