diff options
| author | sravanM <Sravan@mindtribe.com> | 2016-02-05 17:14:30 -0800 |
|---|---|---|
| committer | Evan Wilson <evan@oliodevices.com> | 2016-03-18 13:36:10 -0700 |
| commit | e5af0a972a9220e43dd2d178c2da75fbf3357e78 (patch) | |
| tree | b63eeab1b9af31131d22b51ba55619a4212ebbb5 | |
| parent | 19f19a217a28d5d593cba696b361a196605aaa01 (diff) | |
| download | olio-linux-3.10-e5af0a972a9220e43dd2d178c2da75fbf3357e78.tar.xz olio-linux-3.10-e5af0a972a9220e43dd2d178c2da75fbf3357e78.zip | |
merge conflict fix
Change-Id: I6a3d4b8c74e21367cb1b8b9fac0acfa6c844a658
Signed-off-by: Evan Wilson <evan@oliodevices.com>
| -rw-r--r-- | drivers/iio/imu/st_lsm6ds3/st_lsm6ds3_core.c | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/drivers/iio/imu/st_lsm6ds3/st_lsm6ds3_core.c b/drivers/iio/imu/st_lsm6ds3/st_lsm6ds3_core.c index 089a28fde8c..12dc8cbf1c7 100644 --- a/drivers/iio/imu/st_lsm6ds3/st_lsm6ds3_core.c +++ b/drivers/iio/imu/st_lsm6ds3/st_lsm6ds3_core.c @@ -2256,11 +2256,6 @@ int st_lsm6ds3_reset(struct lsm6ds3_data *cdata, bool hard_reset) { msleep(20); - // err = check_wai(cdata); - // if (err < 0) { - // dev_err(cdata->dev, "Failed to check Who-Am-I register.\n"); - // return err; - // } err = st_lsm6ds3_init_sensor(cdata); if (err < 0) @@ -2294,17 +2289,6 @@ int st_lsm6ds3_common_probe(struct lsm6ds3_data *cdata, int irq) cdata->samples_to_keep_on_wake = ST_LSM6DS3_SAMPLES_ON_WAKE_DEFAULT; cdata->min_latency_samples = ST_LSM6DS3_MIN_LATENCY_SAMPLES; - - err = cdata->tf->read(cdata, ST_LSM6DS3_WAI_ADDRESS, 1, &wai, true); - if (err < 0) { - dev_err(cdata->dev, "failed to read Who-Am-I register.\n"); - return err; - } - if (wai != ST_LSM6DS3_WAI_EXP) { - dev_err(cdata->dev, "Who-Am-I value not valid.\n"); - return -ENODEV; - } - for (i = 0; i < ST_INDIO_DEV_NUM; i++) { cdata->indio_dev[i] = iio_device_alloc(sizeof(*sdata)); if (cdata->indio_dev[i] == NULL) { |