diff options
| author | Julian Oes <julian@oes.ch> | 2014-02-05 21:19:25 +0100 |
|---|---|---|
| committer | Julian Oes <julian@oes.ch> | 2014-02-05 21:19:25 +0100 |
| commit | 3392086f8f317823061363296c8d3e18be4ee88e (patch) | |
| tree | 39216aa42de253d45fac793cb9237a7b058779de /src/systemcmds/mixer | |
| parent | 8a48a4916c49af019bc28766bbf9eff6dfee2a82 (diff) | |
| download | px4-firmware-3392086f8f317823061363296c8d3e18be4ee88e.tar.gz px4-firmware-3392086f8f317823061363296c8d3e18be4ee88e.tar.bz2 px4-firmware-3392086f8f317823061363296c8d3e18be4ee88e.zip | |
Mixer load: don't upload empty mixers from non-existing files
Diffstat (limited to 'src/systemcmds/mixer')
| -rw-r--r-- | src/systemcmds/mixer/mixer.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/systemcmds/mixer/mixer.cpp b/src/systemcmds/mixer/mixer.cpp index 6da39d371..2f5ed3265 100644 --- a/src/systemcmds/mixer/mixer.cpp +++ b/src/systemcmds/mixer/mixer.cpp @@ -102,7 +102,8 @@ load(const char *devname, const char *fname) if (ioctl(dev, MIXERIOCRESET, 0)) err(1, "can't reset mixers on %s", devname); - load_mixer_file(fname, &buf[0], sizeof(buf)); + if (load_mixer_file(fname, &buf[0], sizeof(buf)) < 0) + err(1, "can't load mixer: %s", fname); /* XXX pass the buffer to the device */ int ret = ioctl(dev, MIXERIOCLOADBUF, (unsigned long)buf); |