diff options
| author | Mark Charlebois <charlebm@gmail.com> | 2015-03-19 10:18:11 -0700 |
|---|---|---|
| committer | Mark Charlebois <charlebm@gmail.com> | 2015-04-20 11:15:12 -0700 |
| commit | 653c14fcbb403a69f21f0af92ee5bf84b4c8109d (patch) | |
| tree | 27abd27ae1631024ba3ebede2493df1b59f2c0e9 /src | |
| parent | 1b4b8bb856542d3ce4450fa4b567e65a6c9119e9 (diff) | |
| download | px4-firmware-653c14fcbb403a69f21f0af92ee5bf84b4c8109d.tar.gz px4-firmware-653c14fcbb403a69f21f0af92ee5bf84b4c8109d.tar.bz2 px4-firmware-653c14fcbb403a69f21f0af92ee5bf84b4c8109d.zip | |
Linux: Handle nullptr passed to I2C constructor
I2C class derives from CDev class which requires a devname
but in at least some instances, a nullptr is passed for devname.
Signed-off-by: Mark Charlebois <charlebm@gmail.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/drivers/device/i2c_linux.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/drivers/device/i2c_linux.cpp b/src/drivers/device/i2c_linux.cpp index e62da8797..4548b475a 100644 --- a/src/drivers/device/i2c_linux.cpp +++ b/src/drivers/device/i2c_linux.cpp @@ -63,7 +63,7 @@ I2C::I2C(const char *name, _bus(bus), _address(address), _fd(-1), - _dname(devname) + _dname() { // fill in _device_id fields for a I2C device _device_id.devid_s.bus_type = DeviceBusType_I2C; @@ -71,6 +71,9 @@ I2C::I2C(const char *name, _device_id.devid_s.address = address; // devtype needs to be filled in by the driver _device_id.devid_s.devtype = 0; + + if (devname) + _dname = devname; } I2C::~I2C() |