aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLorenz Meier <lm@inf.ethz.ch>2014-03-09 00:46:13 +0100
committerLorenz Meier <lm@inf.ethz.ch>2014-03-09 00:46:13 +0100
commitd69d895f0240a0dda5fda2f8f046179b069439a4 (patch)
treebed9e5ce8f597d9fd136129535090a79704c0c70
parent171af566f716a99b078eaa4ef0f90405091e8d19 (diff)
downloadpx4-firmware-d69d895f0240a0dda5fda2f8f046179b069439a4.tar.gz
px4-firmware-d69d895f0240a0dda5fda2f8f046179b069439a4.tar.bz2
px4-firmware-d69d895f0240a0dda5fda2f8f046179b069439a4.zip
Add missing CDev init step
-rw-r--r--src/drivers/sf0x/sf0x.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/drivers/sf0x/sf0x.cpp b/src/drivers/sf0x/sf0x.cpp
index f25856689..5dd1f59de 100644
--- a/src/drivers/sf0x/sf0x.cpp
+++ b/src/drivers/sf0x/sf0x.cpp
@@ -209,6 +209,10 @@ SF0X::init()
{
int ret = ERROR;
+ /* do regular cdev init */
+ if (CDev::init() != OK)
+ goto out;
+
/* allocate basic report buffers */
_reports = new RingBuffer(2, sizeof(range_finder_report));
@@ -447,7 +451,7 @@ SF0X::measure()
char cmd = SF0X_TAKE_RANGE_REG;
ret = ::write(_fd, &cmd, 1);
- if (OK != sizeof(cmd)) {
+ if (ret != sizeof(cmd)) {
perf_count(_comms_errors);
log("serial transfer returned %d", ret);
return ret;