Merge branch 'master' into px4io_fix

This commit is contained in:
Lorenz Meier 2013-10-13 12:25:46 +02:00
commit c8f471c560

View File

@ -237,7 +237,7 @@ PX4IO_Uploader::recv(uint8_t &c, unsigned timeout)
fds[0].fd = _io_fd;
fds[0].events = POLLIN;
/* wait 100 ms for a character */
/* wait <timout> ms for a character */
int ret = ::poll(&fds[0], 1, timeout);
if (ret < 1) {