michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers/sensor: lis2dw12: Preserve APIs error code

Browse source 
Return the same error code returned by HAL i/f APIs.

Signed-off-by: Armando Visconti <armando.visconti@st.com>
This commit is contained in:
Armando Visconti 2021-06-24 17:09:54 +02:00 • committed by Anas Nashif
commit fa423d30a2
1 changed files with 18 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

28
drivers/sensor/lis2dw12/lis2dw12.c
View file

@ -241,10 +241,13 @@ static int lis2dw12_init(const struct device *dev)
const struct lis2dw12_device_config *cfg = dev->config; const struct lis2dw12_device_config *cfg = dev->config;
stmdev_ctx_t *ctx = (stmdev_ctx_t *)&cfg->ctx; stmdev_ctx_t *ctx = (stmdev_ctx_t *)&cfg->ctx;
uint8_t wai; uint8_t wai;
int ret;
/* check chip ID */ /* check chip ID */
if (lis2dw12_device_id_get(ctx, &wai) < 0) { ret = lis2dw12_device_id_get(ctx, &wai);
return -EIO; if (ret < 0) {
LOG_ERR("Not able to read dev id");
return ret;
} }
if (wai != LIS2DW12_ID) { if (wai != LIS2DW12_ID) {
@ -253,14 +256,17 @@ static int lis2dw12_init(const struct device *dev)
} }
/* reset device */ /* reset device */
if (lis2dw12_reset_set(ctx, PROPERTY_ENABLE) < 0) { ret = lis2dw12_reset_set(ctx, PROPERTY_ENABLE);
return -EIO; if (ret < 0) {
return ret;
} }
k_busy_wait(100); k_busy_wait(100);
if (lis2dw12_block_data_update_set(ctx, PROPERTY_ENABLE) < 0) { ret = lis2dw12_block_data_update_set(ctx, PROPERTY_ENABLE);
return -EIO; if (ret < 0) {
LOG_ERR("Not able to set BDU");
return ret;
} }
/* set power mode */ /* set power mode */
@ -270,15 +276,17 @@ static int lis2dw12_init(const struct device *dev)
} }
/* set default odr to 12.5Hz acc */ /* set default odr to 12.5Hz acc */
if (lis2dw12_set_odr(dev, 12) < 0) { ret = lis2dw12_set_odr(dev, 12);
if (ret < 0) {
LOG_ERR("odr init error (12.5 Hz)"); LOG_ERR("odr init error (12.5 Hz)");
return -EIO; return ret;
} }
LOG_DBG("range is %d", cfg->range); LOG_DBG("range is %d", cfg->range);
if (lis2dw12_set_range(dev, LIS2DW12_FS_TO_REG(cfg->range)) < 0) { ret = lis2dw12_set_range(dev, LIS2DW12_FS_TO_REG(cfg->range));
if (ret < 0) {
LOG_ERR("range init error %d", cfg->range); LOG_ERR("range init error %d", cfg->range);
return -EIO; return ret;
} }
#ifdef CONFIG_LIS2DW12_TRIGGER #ifdef CONFIG_LIS2DW12_TRIGGER