diff options
| author | Anton Babushkin <anton.babushkin@me.com> | 2013-08-15 10:33:45 +0200 |
|---|---|---|
| committer | Anton Babushkin <anton.babushkin@me.com> | 2013-08-15 10:33:45 +0200 |
| commit | 7476b03543f879df5ea29d44be147ff4926f8216 (patch) | |
| tree | e1c056fa3e12b2c2c3ae601ae2835ac086b60338 /src/drivers/device/cdev.cpp | |
| parent | 39ae01dd07d53e3509826ae3737fc6a509adec34 (diff) | |
| parent | d2f19c7d84030ad6ed1f6c17538fa96864c5dcef (diff) | |
| download | px4-firmware-7476b03543f879df5ea29d44be147ff4926f8216.tar.gz px4-firmware-7476b03543f879df5ea29d44be147ff4926f8216.tar.bz2 px4-firmware-7476b03543f879df5ea29d44be147ff4926f8216.zip | |
Merge branch 'master' into new_state_machine_drton
Diffstat (limited to 'src/drivers/device/cdev.cpp')
| -rw-r--r-- | src/drivers/device/cdev.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/drivers/device/cdev.cpp b/src/drivers/device/cdev.cpp index 422321850..47ebcd40a 100644 --- a/src/drivers/device/cdev.cpp +++ b/src/drivers/device/cdev.cpp @@ -111,21 +111,21 @@ CDev::~CDev() int CDev::init() { - int ret = OK; - // base class init first - ret = Device::init(); + int ret = Device::init(); if (ret != OK) goto out; // now register the driver - ret = register_driver(_devname, &fops, 0666, (void *)this); + if (_devname != nullptr) { + ret = register_driver(_devname, &fops, 0666, (void *)this); - if (ret != OK) - goto out; + if (ret != OK) + goto out; - _registered = true; + _registered = true; + } out: return ret; @@ -395,4 +395,4 @@ cdev_poll(struct file *filp, struct pollfd *fds, bool setup) return cdev->poll(filp, fds, setup); } -} // namespace device
\ No newline at end of file +} // namespace device |