diff options
| author | Viresh Kumar <viresh.kumar@st.com> | 2012-03-27 02:55:24 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-03-27 03:14:35 -0400 |
| commit | 131c713fd96e251fcb18f4d2d05f263aa41bb11f (patch) | |
| tree | b5f1df0edbf89e8952ae251f49059b6a672f0731 | |
| parent | 3183968cbfb76c02f357151f66a1260101f9d82c (diff) | |
Input: tegra-kbc - allocate pdata before using it
Following commit broke DT support for tegra-kbc by removing pdata
allocation completely:
commit 023cea0ecfa2df034096c3f4afa796a0b2d1188a
Author: Shridhar Rasal <srasal@nvidia.com>
Date: Fri Feb 3 00:27:30 2012 -0800
Input: tegra-kbc - allow skipping setting up some of GPIO pins
This patch restores it.
Signed-off-by: Viresh Kumar <viresh.kumar@st.com>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| -rw-r--r-- | drivers/input/keyboard/tegra-kbc.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/input/keyboard/tegra-kbc.c b/drivers/input/keyboard/tegra-kbc.c index 21c42f85234..fe4ac95ca6c 100644 --- a/drivers/input/keyboard/tegra-kbc.c +++ b/drivers/input/keyboard/tegra-kbc.c | |||
| @@ -630,6 +630,7 @@ tegra_kbc_dt_parse_pdata(struct platform_device *pdev) | |||
| 630 | if (!np) | 630 | if (!np) |
| 631 | return NULL; | 631 | return NULL; |
| 632 | 632 | ||
| 633 | pdata = kzalloc(sizeof(*pdata), GFP_KERNEL); | ||
| 633 | if (!pdata) | 634 | if (!pdata) |
| 634 | return NULL; | 635 | return NULL; |
| 635 | 636 | ||