diff options
| author | Tejun Heo <tj@kernel.org> | 2010-02-02 06:38:15 +0100 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2010-02-02 06:38:15 +0100 |
| commit | ab386128f20c44c458a90039ab1bdc265ac474c9 (patch) | |
| tree | 2ad188744922b1bb951fd10ff50dc04c83acce22 /drivers/input/keyboard/davinci_keyscan.c | |
| parent | local_t: Remove leftover local.h (diff) | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiw... (diff) | |
| download | linux-ab386128f20c44c458a90039ab1bdc265ac474c9.tar.xz linux-ab386128f20c44c458a90039ab1bdc265ac474c9.zip | |
Merge branch 'master' into percpu
Diffstat (limited to 'drivers/input/keyboard/davinci_keyscan.c')
| -rw-r--r-- | drivers/input/keyboard/davinci_keyscan.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/input/keyboard/davinci_keyscan.c b/drivers/input/keyboard/davinci_keyscan.c index 6e52d855f637..d410d7a52f1d 100644 --- a/drivers/input/keyboard/davinci_keyscan.c +++ b/drivers/input/keyboard/davinci_keyscan.c @@ -174,6 +174,14 @@ static int __init davinci_ks_probe(struct platform_device *pdev) struct davinci_ks_platform_data *pdata = pdev->dev.platform_data; int error, i; + if (pdata->device_enable) { + error = pdata->device_enable(dev); + if (error < 0) { + dev_dbg(dev, "device enable function failed\n"); + return error; + } + } + if (!pdata->keymap) { dev_dbg(dev, "no keymap from pdata\n"); return -EINVAL; |