diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2013-09-13 09:56:01 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2013-09-13 09:56:01 +0200 |
| commit | 11530ac0211cec338eb86f2aaf4dff897cccea90 (patch) | |
| tree | b71159bfa15b80896f8eb3067ceb06df632bc8c1 /src/drivers/lsm303d | |
| parent | e3864e7dbbe03a4ae7bdc9eb5ea12123477dd07f (diff) | |
| parent | 19fdaf2009d41885923b586432cb2506a24ca5b3 (diff) | |
| download | px4-firmware-11530ac0211cec338eb86f2aaf4dff897cccea90.tar.gz px4-firmware-11530ac0211cec338eb86f2aaf4dff897cccea90.tar.bz2 px4-firmware-11530ac0211cec338eb86f2aaf4dff897cccea90.zip | |
Merge remote-tracking branch 'origin/spi-device-locking' into fat-dma-spi
Diffstat (limited to 'src/drivers/lsm303d')
| -rw-r--r-- | src/drivers/lsm303d/lsm303d.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/drivers/lsm303d/lsm303d.cpp b/src/drivers/lsm303d/lsm303d.cpp index 0b0906d9e..83919d263 100644 --- a/src/drivers/lsm303d/lsm303d.cpp +++ b/src/drivers/lsm303d/lsm303d.cpp @@ -525,7 +525,6 @@ out: void LSM303D::reset() { - irqstate_t flags = irqsave(); /* enable accel*/ write_reg(ADDR_CTRL_REG1, REG1_X_ENABLE_A | REG1_Y_ENABLE_A | REG1_Z_ENABLE_A | REG1_BDU_UPDATE); @@ -549,15 +548,12 @@ LSM303D::reset() int LSM303D::probe() { - irqstate_t flags = irqsave(); /* read dummy value to void to clear SPI statemachine on sensor */ (void)read_reg(ADDR_WHO_AM_I); /* verify that the device is attached and functioning */ bool success = (read_reg(ADDR_WHO_AM_I) == WHO_I_AM); - irqrestore(flags); - if (success) return OK; |