aboutsummaryrefslogtreecommitdiff
path: root/apps/drivers
diff options
context:
space:
mode:
authorLorenz Meier <lm@inf.ethz.ch>2012-11-12 21:08:57 +0100
committerLorenz Meier <lm@inf.ethz.ch>2012-11-12 21:08:57 +0100
commite52c7e3c4ba4f909ae7ae51347c0c659c0c9cea7 (patch)
tree6e9536b2b6dd9779dc0d96728bd912f3ffd411f5 /apps/drivers
parente9942e4af7f5b35e7d3efe4381ed6127e5c6a91c (diff)
parent66e806754ba17c127cd9fa657b0bad5d0b2015a3 (diff)
downloadpx4-firmware-e52c7e3c4ba4f909ae7ae51347c0c659c0c9cea7.tar.gz
px4-firmware-e52c7e3c4ba4f909ae7ae51347c0c659c0c9cea7.tar.bz2
px4-firmware-e52c7e3c4ba4f909ae7ae51347c0c659c0c9cea7.zip
Merge branch 'master' of github.com:PX4/Firmware
Diffstat (limited to 'apps/drivers')
-rw-r--r--apps/drivers/hil/hil.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/apps/drivers/hil/hil.cpp b/apps/drivers/hil/hil.cpp
index ecccfb5b0..67b16aa42 100644
--- a/apps/drivers/hil/hil.cpp
+++ b/apps/drivers/hil/hil.cpp
@@ -474,6 +474,7 @@ HIL::ioctl(file *filp, int cmd, unsigned long arg)
ret = HIL::pwm_ioctl(filp, cmd, arg);
break;
default:
+ ret = -ENOTTY;
debug("not in a PWM mode");
break;
}
@@ -489,7 +490,7 @@ int
HIL::pwm_ioctl(file *filp, int cmd, unsigned long arg)
{
int ret = OK;
- int channel;
+ // int channel;
lock();