From d69d895f0240a0dda5fda2f8f046179b069439a4 Mon Sep 17 00:00:00 2001 From: Lorenz Meier Date: Sun, 9 Mar 2014 00:46:13 +0100 Subject: [PATCH] Add missing CDev init step --- src/drivers/sf0x/sf0x.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/drivers/sf0x/sf0x.cpp b/src/drivers/sf0x/sf0x.cpp index f25856689b..5dd1f59dea 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;