linux-ti335x-psp: add 3.2 based on 3.2-staging branch
[glsdk/meta-ti-glsdk.git] / recipes-kernel / linux / linux-ti33x-psp-3.2 / 0009-tscadc-Add-board-file-mfd-support-fix-warning.patch
1 From f7330897eabdf0275cd51213fe1dc778e165d07c Mon Sep 17 00:00:00 2001
2 From: Joel A Fernandes <joelagnel@ti.com>
3 Date: Wed, 30 Nov 2011 15:02:17 +0100
4 Subject: [PATCH 09/16] tscadc: Add board file mfd support, fix warning
6 Signed-off-by: Joel A Fernandes <joelagnel@ti.com>
8 Conflicts:
10         arch/arm/mach-omap2/board-am335xevm.c
11 ---
12  arch/arm/mach-omap2/board-am335xevm.c |    2 +-
13  drivers/input/touchscreen/ti_tscadc.c |    2 +-
14  2 files changed, 2 insertions(+), 2 deletions(-)
16 diff --git a/arch/arm/mach-omap2/board-am335xevm.c b/arch/arm/mach-omap2/board-am335xevm.c
17 index c7bb091..17705b3 100644
18 --- a/arch/arm/mach-omap2/board-am335xevm.c
19 +++ b/arch/arm/mach-omap2/board-am335xevm.c
20 @@ -2182,7 +2182,7 @@ static struct evm_dev_cfg beaglebone_old_dev_cfg[] = {
21         {i2c2_init,     DEV_ON_BASEBOARD, PROFILE_NONE},
22         {mmc0_init,     DEV_ON_BASEBOARD, PROFILE_NONE},
23         {boneleds_init, DEV_ON_BASEBOARD, PROFILE_ALL},
24 -       {tsc_init,      DEV_ON_BASEBOARD, PROFILE_ALL},
25 +       {bone_tsc_init,         DEV_ON_BASEBOARD, PROFILE_ALL},
26         {NULL, 0, 0},
27  };
28  
29 diff --git a/drivers/input/touchscreen/ti_tscadc.c b/drivers/input/touchscreen/ti_tscadc.c
30 index 699503d..f813564 100644
31 --- a/drivers/input/touchscreen/ti_tscadc.c
32 +++ b/drivers/input/touchscreen/ti_tscadc.c
33 @@ -462,7 +462,7 @@ static irqreturn_t tsc_interrupt(int irq, void *dev)
34  static int __devinit tscadc_probe(struct platform_device *pdev)
35  {
36         struct tscadc                   *ts_dev;
37 -       struct input_dev                *input_dev;
38 +       struct input_dev                *input_dev = NULL;
39         int                             err;
40         int                             clk_value;
41         int                             clock_rate, irqenable, ctrl;
42 -- 
43 1.7.7.5