Merge tag 'stable/for-linus-3.14-rc5-tag' of git://git.kernel.org/pub/scm/linux/kerne...

[karo-tx-linux.git] / drivers / input / keyboard / tnetv107x-keypad.c

diff --git a/drivers/input/keyboard/tnetv107x-keypad.c b/drivers/input/keyboard/tnetv107x-keypad.c
index 8bd24d52bf1bedd0438e0737350c640b6e3b38b8..086511c2121b821b701fe12ba9ec3763f8470e3b 100644 (file)
--- a/drivers/input/keyboard/tnetv107x-keypad.c
+++ b/drivers/input/keyboard/tnetv107x-keypad.c
@@ -162,7 +162,7 @@ static int keypad_probe(struct platform_device *pdev)
        int error = 0, sz, row_shift;
        u32 rev = 0;
 
-       pdata = pdev->dev.platform_data;
+       pdata = dev_get_platdata(&pdev->dev);
        if (!pdata) {
                dev_err(dev, "cannot find device data\n");
                return -EINVAL;