]> rtime.felk.cvut.cz Git - sojka/nv-tegra/linux-3.10.git/commitdiff
staging: iio: light: turn on SAR detection at boot
authorSri Krishna chowdary <schowdary@nvidia.com>
Thu, 27 Mar 2014 12:42:03 +0000 (18:12 +0530)
committerSimone Willett <swillett@nvidia.com>
Tue, 1 Apr 2014 20:17:57 +0000 (13:17 -0700)
SAR detection should always be turned on irrespective of
stylus detect option specified during boot time.

Bug 1420230

Change-Id: I516eb59e1945de141c94905862d5da36b5199693
Signed-off-by: Sri Krishna chowdary <schowdary@nvidia.com>
Reviewed-on: http://git-master/r/387722
Reviewed-by: Simone Willett <swillett@nvidia.com>
Tested-by: Simone Willett <swillett@nvidia.com>
drivers/staging/iio/light/iqs253.c

index 37b0b90403c2b4b70ce119d049ec0a37235e7031..455e23473b46ac8a6e7c61680a561a89b2f25738 100644 (file)
@@ -690,6 +690,13 @@ static int iqs253_probe(struct i2c_client *client,
        if (!stylus_detect)
                goto finish;
 
+       idev = iqs253_stylus_input_init(iqs253_chip);
+       if (IS_ERR_OR_NULL(idev))
+               goto err_gpio_request;
+       iqs253_chip->idev = idev;
+
+finish:
+
 #if !defined(CONFIG_SENSORS_IQS253_AS_PROXIMITY)
        iqs253_chip->sar_wq = create_freezable_workqueue("iqs253_sar");
        if (!iqs253_chip->sar_wq) {
@@ -703,12 +710,6 @@ static int iqs253_probe(struct i2c_client *client,
        queue_delayed_work(iqs253_chip->sar_wq, &iqs253_chip->sar_dw, 0);
 #endif
 
-       idev = iqs253_stylus_input_init(iqs253_chip);
-       if (IS_ERR_OR_NULL(idev))
-               goto err_gpio_request;
-       iqs253_chip->idev = idev;
-
-finish:
        dev_info(&client->dev, "devname:%s func:%s line:%d probe success\n",
                        id->name, __func__, __LINE__);