diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-01-23 08:10:44 -0800 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-01-23 08:10:44 -0800 |
| commit | 55df811f2066fcaec2548248f0a1a6a0c12dc6b8 (patch) | |
| tree | 0850f490489e5b941692f3fe36dff5d2c1c35c3c /drivers/input/keyboard/ep93xx_keypad.c | |
| parent | 8e2f2325b73f3e5e46ecffd291556f33b8e3f8c9 (diff) | |
| parent | 497ab1f290a26fa9414c5c316515f1e2ddba0803 (diff) | |
Merge branch 'next' into for-linus
First round of input updates for 3.14.
Diffstat (limited to 'drivers/input/keyboard/ep93xx_keypad.c')
| -rw-r--r-- | drivers/input/keyboard/ep93xx_keypad.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/keyboard/ep93xx_keypad.c b/drivers/input/keyboard/ep93xx_keypad.c index 47206bdba411..e59876212b8c 100644 --- a/drivers/input/keyboard/ep93xx_keypad.c +++ b/drivers/input/keyboard/ep93xx_keypad.c @@ -244,7 +244,7 @@ static int ep93xx_keypad_probe(struct platform_device *pdev) if (!keypad) return -ENOMEM; - keypad->pdata = pdev->dev.platform_data; + keypad->pdata = dev_get_platdata(&pdev->dev); if (!keypad->pdata) { err = -EINVAL; goto failed_free; |