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 / nomadik-ske-keypad.c

diff --git a/drivers/input/keyboard/nomadik-ske-keypad.c b/drivers/input/keyboard/nomadik-ske-keypad.c
index c7d505cce72f7b36e3658ae5cdea16a0cc96ffba..63332e2f86288f75827e95342f7043b47b09e472 100644 (file)
--- a/drivers/input/keyboard/nomadik-ske-keypad.c
+++ b/drivers/input/keyboard/nomadik-ske-keypad.c
@@ -222,7 +222,8 @@ static irqreturn_t ske_keypad_irq(int irq, void *dev_id)
 
 static int __init ske_keypad_probe(struct platform_device *pdev)
 {
-       const struct ske_keypad_platform_data *plat = pdev->dev.platform_data;
+       const struct ske_keypad_platform_data *plat =
+                       dev_get_platdata(&pdev->dev);
        struct ske_keypad *keypad;
        struct input_dev *input;
        struct resource *res;