diff --git a/firmware/usb.c b/firmware/usb.c
index 55dc1348c2..4224761c71 100644
--- a/firmware/usb.c
+++ b/firmware/usb.c
@@ -310,8 +310,8 @@ static int hid_control_request(usbd_device *dev, struct usb_setup_data *req, uin
 		debugLog(0, "", "hid_control_request debug");
 		*buf = (uint8_t *)hid_report_descriptor_debug;
 		*len = sizeof(hid_report_descriptor_debug);
+		return 1;
 	}
-	return 1;
 #endif
 
 	debugLog(0, "", "hid_control_request main");
diff --git a/vendor/trezor-common b/vendor/trezor-common
index 603d3c18e1..4c2b12b0c5 160000
--- a/vendor/trezor-common
+++ b/vendor/trezor-common
@@ -1 +1 @@
-Subproject commit 603d3c18e1a90d0825b2ef2093c5e8b1540c1f0a
+Subproject commit 4c2b12b0c51e293fe08f04554cdd55a081250653
diff --git a/vendor/trezor-crypto b/vendor/trezor-crypto
index 16f477787d..d61a151900 160000
--- a/vendor/trezor-crypto
+++ b/vendor/trezor-crypto
@@ -1 +1 @@
-Subproject commit 16f477787d7e59a37e0f05807182cef8aeb1e2d5
+Subproject commit d61a151900a08022f2243808fd28b8b076979d3e