X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fkingst-la2016%2Fapi.c;h=e1a2833220f1c2fed6fbb530642d8482bafc8900;hb=91aa0f043318df0269bc9247ddaaa1c7785e68d1;hp=3fec45b625ea9b60f2d12810f2e82ad107962d73;hpb=4494721714407631b2410f21b493134d265bf695;p=libsigrok.git

diff --git a/src/hardware/kingst-la2016/api.c b/src/hardware/kingst-la2016/api.c
index 3fec45b6..e1a28332 100644
--- a/src/hardware/kingst-la2016/api.c
+++ b/src/hardware/kingst-la2016/api.c
@@ -517,9 +517,10 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 		 * this device.
 		 */
 		devc->fw_uploaded = 0;
+		devc->usb_pid = pid;
 		if (des.iProduct != LA2016_IPRODUCT_INDEX) {
 			sr_info("Uploading MCU firmware to '%s'.", conn_id);
-			ret = la2016_upload_firmware(sdi, ctx, dev, pid);
+			ret = la2016_upload_firmware(sdi, ctx, dev, FALSE);
 			if (ret != SR_OK) {
 				sr_err("MCU firmware upload failed.");
 				kingst_la2016_free_sdi(sdi);
@@ -529,6 +530,13 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 			usb->address = 0xff;
 			renum_devices = g_slist_append(renum_devices, sdi);
 			continue;
+		} else {
+			ret = la2016_upload_firmware(sdi, NULL, NULL, TRUE);
+			if (ret != SR_OK) {
+				sr_err("MCU firmware filename check failed.");
+				kingst_la2016_free_sdi(sdi);
+				continue;
+			}
 		}
 
 		/*