summaryrefslogtreecommitdiffstats
path: root/drivers/input/keyboard/tegra-kbc.c
diff options
context:
space:
mode:
authorViresh Kumar <viresh.kumar@st.com>2012-03-27 08:55:24 +0200
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2012-03-27 09:14:35 +0200
commit131c713fd96e251fcb18f4d2d05f263aa41bb11f (patch)
treeb5f1df0edbf89e8952ae251f49059b6a672f0731 /drivers/input/keyboard/tegra-kbc.c
parentInput: amijoy - add missing platform check (diff)
downloadlinux-131c713fd96e251fcb18f4d2d05f263aa41bb11f.tar.xz
linux-131c713fd96e251fcb18f4d2d05f263aa41bb11f.zip
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>
Diffstat (limited to 'drivers/input/keyboard/tegra-kbc.c')
-rw-r--r--drivers/input/keyboard/tegra-kbc.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/input/keyboard/tegra-kbc.c b/drivers/input/keyboard/tegra-kbc.c
index 21c42f852343..fe4ac95ca6c8 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)
if (!np)
return NULL;
+ pdata = kzalloc(sizeof(*pdata), GFP_KERNEL);
if (!pdata)
return NULL;