From c06d51d02a1b1cfbcb4b8617700d9e0af61705c1 Mon Sep 17 00:00:00 2001
From: Mark Charlebois <charlebm@gmail.com>
Date: Wed, 20 Jan 2016 21:47:49 -0800
Subject: [PATCH] More bad merge fixes

Signed-off-by: Mark Charlebois <charlebm@gmail.com>
---
 src/platforms/posix/tests/vcdev_test/vcdevtest_example.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/platforms/posix/tests/vcdev_test/vcdevtest_example.cpp b/src/platforms/posix/tests/vcdev_test/vcdevtest_example.cpp
index da9519ea27..4d82e3dc88 100644
--- a/src/platforms/posix/tests/vcdev_test/vcdevtest_example.cpp
+++ b/src/platforms/posix/tests/vcdev_test/vcdevtest_example.cpp
@@ -321,12 +321,16 @@ int VCDevExample::main()
 				 (char *const *)NULL);
 
 	ret = 0;
+
 	PX4_INFO("TEST: BLOCKING POLL ---------------");
 
 	if (do_poll(fd, -1, 3, 0)) {
 		ret = 1;
 		goto fail2;
+	}
+
 	PX4_INFO("TEST: ZERO TIMEOUT POLL -----------");
+
 	if(do_poll(fd, 0, 3, 0)) {
 		ret = 1;
 		goto fail2;
@@ -352,6 +356,7 @@ int VCDevExample::main()
 	if (do_poll(fd, 1000, 3, 0)) {
 		ret = 1;
 		goto fail2;
+	}
 	PX4_INFO("TEST: waiting for writer to stop");
 fail2:
 	g_exit = true;