diff options
| author | Andrew Tridgell <tridge@samba.org> | 2014-07-06 22:37:40 +1000 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-07-08 12:02:53 +0200 |
| commit | dfee93f3b128a7f23d74363b7700c80ababbe690 (patch) | |
| tree | d9340dc5e9c649b6c898671dcff4e5ba95bb60fe /src/drivers/hmc5883/hmc5883.cpp | |
| parent | 5e62ae7a9e2a7d3ea05d293900f7171884fbb448 (diff) | |
| download | px4-firmware-dfee93f3b128a7f23d74363b7700c80ababbe690.tar.gz px4-firmware-dfee93f3b128a7f23d74363b7700c80ababbe690.tar.bz2 px4-firmware-dfee93f3b128a7f23d74363b7700c80ababbe690.zip | |
hmc5883: fixed driver startup when trying both buses
Diffstat (limited to 'src/drivers/hmc5883/hmc5883.cpp')
| -rw-r--r-- | src/drivers/hmc5883/hmc5883.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/drivers/hmc5883/hmc5883.cpp b/src/drivers/hmc5883/hmc5883.cpp index 65c8c64d0..25cbc0679 100644 --- a/src/drivers/hmc5883/hmc5883.cpp +++ b/src/drivers/hmc5883/hmc5883.cpp @@ -1325,11 +1325,11 @@ start(enum Rotation rotation) exit(0); fail: - if (g_dev_int != nullptr) { + if (g_dev_int != nullptr && (bus == -1 || bus == PX4_I2C_BUS_ONBOARD)) { delete g_dev_int; g_dev_int = nullptr; } - if (g_dev_ext != nullptr) { + if (g_dev_ext != nullptr && (bus == -1 || bus == PX4_I2C_BUS_EXPANSION)) { delete g_dev_ext; g_dev_ext = nullptr; } |