Merge branch 'master' of https://www.github.com/PX4/Firmware into getopt-cleanup-v2

src/drivers/device/vdev.cpp

@@ -324,6 +324,7 @@ VDev::ioctl(file_t *filep, int cmd, unsigned long arg)
         case DEVIOCGDEVICEID:
                 ret = (int)_device_id.devid;
 		PX4_INFO("IOCTL DEVIOCGDEVICEID %d", ret);
+		break;
 	default:
 		break;
 	}

src/drivers/device/vdev_posix.cpp

@@ -201,7 +201,7 @@ int px4_ioctl(int fd, int cmd, unsigned long arg)
 		px4_errno = -ret;
 	}
 	
-        return (ret == 0) ? PX4_OK : PX4_ERROR;
+        return ret;
 }
 
 int px4_poll(px4_pollfd_struct_t *fds, nfds_t nfds, int timeout)