From 3b6c19303db9da2d70a65880fa85883273b17a5a Mon Sep 17 00:00:00 2001
From: Bert Vermeulen <bert@biot.com>
Date: Wed, 27 Jun 2012 01:02:39 +0200
Subject: [PATCH] fx2lafw: fix broken firmware upload timeout

Also corner case error init.
---
 hardware/fx2lafw/fx2lafw.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/hardware/fx2lafw/fx2lafw.c b/hardware/fx2lafw/fx2lafw.c
index 76c5019d..2e88241e 100644
--- a/hardware/fx2lafw/fx2lafw.c
+++ b/hardware/fx2lafw/fx2lafw.c
@@ -467,8 +467,7 @@ static int hw_dev_open(int dev_index)
 	 * If the firmware was recently uploaded, wait up to MAX_RENUM_DELAY_MS
 	 * milliseconds for the FX2 to renumerate.
 	 */
-	ret = 0;
-
+	ret = SR_ERR;
 	if (ctx->fw_updated > 0) {
 		sr_info("fx2lafw: Waiting for device to reset.");
 		/* takes at least 300ms for the FX2 to be gone from the USB bus */
@@ -480,9 +479,8 @@ static int hw_dev_open(int dev_index)
 			g_usleep(100 * 1000);
 
 			timediff_us = g_get_monotonic_time() - ctx->fw_updated;
-			timediff_ms = timediff_us / G_USEC_PER_SEC;
-			sr_spew("fx2lafw: timediff: %" PRIi64 " us.",
-				timediff_us);
+			timediff_ms = timediff_us / 1000;
+			sr_spew("fx2lafw: waited %" PRIi64 " ms", timediff_ms);
 		}
 		sr_info("fx2lafw: Device came back after %d ms.", timediff_ms);
 	} else {