On Sun, Sep 05, 2010 at 11:10:44AM +0800, Axel Lin wrote:
> Signed-off-by: Axel Lin <axel.lin@xxxxxxxxx>
Acked-by: Wolfram Sang <w.sang@xxxxxxxxxxxxxx>
> ---
> Change since v1:
> remove unneeded initialization of 'ret' variable
>
> drivers/input/touchscreen/stmpe-ts.c | 10 +++++++---
> 1 files changed, 7 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/input/touchscreen/stmpe-ts.c b/drivers/input/touchscreen/stmpe-ts.c
> index 656148e..06869e4 100644
> --- a/drivers/input/touchscreen/stmpe-ts.c
> +++ b/drivers/input/touchscreen/stmpe-ts.c
> @@ -268,7 +268,7 @@ static int __devinit stmpe_input_probe(struct platform_device *pdev)
> struct stmpe_touch *ts;
> struct input_dev *idev;
> struct stmpe_ts_platform_data *ts_pdata = NULL;
> - int ret = 0;
> + int ret;
> int ts_irq;
>
> ts_irq = platform_get_irq_byname(pdev, "FIFO_TH");
> @@ -276,12 +276,16 @@ static int __devinit stmpe_input_probe(struct platform_device *pdev)
> return ts_irq;
>
> ts = kzalloc(sizeof(*ts), GFP_KERNEL);
> - if (!ts)
> + if (!ts) {
> + ret = -ENOMEM;
> goto err_out;
> + }
>
> idev = input_allocate_device();
> - if (!idev)
> + if (!idev) {
> + ret = -ENOMEM;
> goto err_free_ts;
> + }
>
> platform_set_drvdata(pdev, ts);
> ts->stmpe = stmpe;
> --
> 1.7.0.4
>
>
>
--
Pengutronix e.K. | Wolfram Sang |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Attachment:
signature.asc
Description: Digital signature
