]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
tsc2007: fail registration on i2c error
authorRob Herring <r.herring@freescale.com>
Fri, 16 Oct 2009 19:41:52 +0000 (14:41 -0500)
committerLothar Waßmann <LW@KARO-electronics.de>
Fri, 24 May 2013 06:32:28 +0000 (08:32 +0200)
Return an error on probe if i2c errors occur indicating the device
is not present.

Signed-off-by: Rob Herring <r.herring@freescale.com>
drivers/input/touchscreen/tsc2007.c

index fadc11545b1eed03124b1c6cd152db8c737345de..da7432726c9960b4caee0acf0be01a3fbe848639 100644 (file)
@@ -300,6 +300,13 @@ static int __devinit tsc2007_probe(struct i2c_client *client,
        ts->get_pendown_state = pdata->get_pendown_state;
        ts->clear_penirq      = pdata->clear_penirq;
 
+       pdata->init_platform_hw();
+
+       if (tsc2007_xfer(ts, PWRDOWN) < 0) {
+               err = -ENODEV;
+               goto err_no_dev;
+       }
+
        snprintf(ts->phys, sizeof(ts->phys),
                 "%s/input0", dev_name(&client->dev));
 
@@ -344,6 +351,8 @@ static int __devinit tsc2007_probe(struct i2c_client *client,
                pdata->exit_platform_hw();
  err_free_mem:
        input_free_device(input_dev);
+ err_no_dev:
+       pdata->exit_platform_hw();
        kfree(ts);
        return err;
 }