diff options
| author | Tiberiu Breana | 2015-06-19 16:56:37 +0200 |
|---|---|---|
| committer | Jonathan Cameron | 2015-06-21 14:53:03 +0200 |
| commit | db42a9be9f05516255e749a5ee4c1e5d07e0a73b (patch) | |
| tree | 9cf74fcba4151ceb1806c26cfc0bfd5249765754 /drivers/iio/accel/stk8ba50.c | |
| parent | iio: light: isl29125: Add scale_available information (diff) | |
| download | kernel-qcow2-linux-db42a9be9f05516255e749a5ee4c1e5d07e0a73b.tar.gz kernel-qcow2-linux-db42a9be9f05516255e749a5ee4c1e5d07e0a73b.tar.xz kernel-qcow2-linux-db42a9be9f05516255e749a5ee4c1e5d07e0a73b.zip | |
iio: accel: STK8BA50: suspend sensor on init errors
Put chip in 'suspend' mode in case something goes wrong
during probe.
Signed-off-by: Tiberiu Breana <tiberiu.a.breana@intel.com>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Diffstat (limited to 'drivers/iio/accel/stk8ba50.c')
| -rw-r--r-- | drivers/iio/accel/stk8ba50.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/iio/accel/stk8ba50.c b/drivers/iio/accel/stk8ba50.c index 92229bd8c82d..9836880cc2d1 100644 --- a/drivers/iio/accel/stk8ba50.c +++ b/drivers/iio/accel/stk8ba50.c @@ -265,7 +265,7 @@ static int stk8ba50_probe(struct i2c_client *client, STK8BA50_REG_SWRST, STK8BA50_RESET_CMD); if (ret < 0) { dev_err(&client->dev, "failed to reset sensor\n"); - return ret; + goto err_power_off; } /* The default range is +/-2g */ @@ -277,10 +277,14 @@ static int stk8ba50_probe(struct i2c_client *client, ret = iio_device_register(indio_dev); if (ret < 0) { dev_err(&client->dev, "device_register failed\n"); - stk8ba50_set_power(data, STK8BA50_MODE_SUSPEND); + goto err_power_off; } return ret; + +err_power_off: + stk8ba50_set_power(data, STK8BA50_MODE_SUSPEND); + return ret; } static int stk8ba50_remove(struct i2c_client *client) |