[mynewt-core] branch master updated: sensor/lis2dh12: Fix compile error introduced by adding support for lis2dk10

[benmccrea]

This is an automated email from the ASF dual-hosted git repository.

benmccrea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-core.git


The following commit(s) were added to refs/heads/master by this push:
     new 7cc3d93a6 sensor/lis2dh12: Fix compile error introduced by adding 
support for lis2dk10
     new c7061b2b9 Merge pull request #2811 from JuulLabs/fix-lis2dh10-compile
7cc3d93a6 is described below

commit 7cc3d93a6737446c973d9c62bab2b4309ec4b46d
Author: Ben McCrea <bmcc...@juul.com>
AuthorDate: Wed Apr 13 12:28:09 2022 -0700

    sensor/lis2dh12: Fix compile error introduced by adding support for lis2dk10
---
 hw/drivers/sensors/lis2dh12/src/lis2dh12.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/hw/drivers/sensors/lis2dh12/src/lis2dh12.c 
b/hw/drivers/sensors/lis2dh12/src/lis2dh12.c
index 502e76e1f..5b46f8eb0 100644
--- a/hw/drivers/sensors/lis2dh12/src/lis2dh12.c
+++ b/hw/drivers/sensors/lis2dh12/src/lis2dh12.c
@@ -645,7 +645,7 @@ lis2dh12_pull_up_disc(struct sensor_itf *itf, uint8_t 
disconnect)
 #if MYNEWT_VAL(LIS2DH12_LIS2DK10_COMPAT)
     rc = lis2dh12_readlen(itf, LIS2DH12_REG_CTRL_REG0, &reg, 1);
     if (rc) {
-        goto err;
+        return rc;
     }
     reg &= ~LIS2DH12_CTRL_REG0_SPD;
     reg |= (disconnect ? LIS2DH12_CTRL_REG0_SPD : 0);
@@ -657,7 +657,6 @@ lis2dh12_pull_up_disc(struct sensor_itf *itf, uint8_t 
disconnect)
 
     rc = lis2dh12_writelen(itf, LIS2DH12_REG_CTRL_REG0, &reg, 1);
 
-err:
     return rc;
 }