From: Christian Lamparter <chunkeey@googlemail.com>
Date: Fri, 15 Oct 2010 20:12:45 +0000 (+0200)
Subject: carlu: fix copy+paste error
X-Git-Tag: 1.9.1~17
X-Git-Url: https://jxself.org/git/?a=commitdiff_plain;h=cb8a23e4affd8b3e359f90a56e699b94f69c0b26;p=carl9170fw.git

carlu: fix copy+paste error

Don't download and check the firmware image twice.

Signed-off-by: Christian Lamparter <chunkeey@googlemail.com>
---

diff --git a/tools/carlu/src/usb.c b/tools/carlu/src/usb.c
index a6d7cb8..c99dbc1 100644
--- a/tools/carlu/src/usb.c
+++ b/tools/carlu/src/usb.c
@@ -562,14 +562,6 @@ static int carlusb_upload_firmware(struct carlusb *ar, bool boot)
 	if (IS_ERR_OR_NULL(buf))
 		return PTR_ERR(buf);
 
-	ret = carlu_fw_check(&ar->common);
-	if (ret)
-		return ret;
-
-	ret = carlusb_fw_check(ar);
-	if (ret)
-		return ret;
-
 	if (ar->miniboot_size) {
 		dbg("Miniboot firmware size:%d\n", ar->miniboot_size);
 		len -= ar->miniboot_size;
@@ -689,10 +681,6 @@ struct carlu *carlusb_probe(void)
 	ar->stop_event_polling = false;
 	ar->event_thread = SDL_CreateThread(carlusb_event_thread, ar);
 
-	ret = carlusb_load_firmware(ar);
-	if (ret)
-		goto err_out;
-
 	ret = carlusb_upload_firmware(ar, true);
 	if (ret)
 		goto err_kill;