diff options
author | Lorenz Meier <lm@inf.ethz.ch> | 2014-12-28 21:09:58 +0100 |
---|---|---|
committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-12-28 21:09:58 +0100 |
commit | 6b2f3f9b07cdf01ad6b11c8bab9723bfbac97c92 (patch) | |
tree | 9503a0a82e1f7ca09dbfac9f4cc81f695e28637b /src/modules/sdlog2/sdlog2.c | |
parent | 784888e1757661a267978c25a00d03c1a348db21 (diff) | |
parent | c29972424f6d7b99633c8497f0c25ab7cda4d2ca (diff) | |
download | px4-firmware-6b2f3f9b07cdf01ad6b11c8bab9723bfbac97c92.tar.gz px4-firmware-6b2f3f9b07cdf01ad6b11c8bab9723bfbac97c92.tar.bz2 px4-firmware-6b2f3f9b07cdf01ad6b11c8bab9723bfbac97c92.zip |
Merged master into nuttx_bringup / nuttx_noappconfig
Diffstat (limited to 'src/modules/sdlog2/sdlog2.c')
-rw-r--r-- | src/modules/sdlog2/sdlog2.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/modules/sdlog2/sdlog2.c b/src/modules/sdlog2/sdlog2.c index d1f21bc19..fd7281f90 100644 --- a/src/modules/sdlog2/sdlog2.c +++ b/src/modules/sdlog2/sdlog2.c @@ -305,7 +305,7 @@ int sdlog2_main(int argc, char *argv[]) SCHED_PRIORITY_DEFAULT - 30, 3000, sdlog2_thread_main, - (const char **)argv); + (char * const *)argv); exit(0); } @@ -1095,6 +1095,8 @@ int sdlog2_thread_main(int argc, char *argv[]) if (_extended_logging) { subs.sat_info_sub = orb_subscribe(ORB_ID(satellite_info)); + } else { + subs.sat_info_sub = 0; } /* close non-needed fd's */ |