summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAidan MacDonald <amachronic@protonmail.com>2023-01-23 16:01:43 +0000
committerAidan MacDonald <amachronic@protonmail.com>2023-01-23 16:04:16 +0000
commit1025283042119a1eb691eed977cee466be59f0a4 (patch)
tree6c0ef3890bafc1735cd7292a58c123796b9c6677
parentc0c1a6e5f0a52a32370b3b2a68c6ce10c42d2565 (diff)
downloadrockbox-1025283042.tar.gz
rockbox-1025283042.zip
usb: Fix iPod video connection issuesHEADmaster
Apparently a response is coming out of nowhere and tripping this check. I can't be bothered to look into it; it would be better to just update the ARC USB driver to the new control request API... Change-Id: Ic5062443e060534f170d3afe17c00d3c25d1d3bd
-rw-r--r--firmware/usbstack/usb_core.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/firmware/usbstack/usb_core.c b/firmware/usbstack/usb_core.c
index 5e50d21383..9fe8b3e603 100644
--- a/firmware/usbstack/usb_core.c
+++ b/firmware/usbstack/usb_core.c
@@ -1040,10 +1040,15 @@ void usb_drv_control_response(enum usb_control_response resp,
unsigned int num_active = num_active_requests--;
/*
- * There must have been a prior request submission, at least.
+ * There should have been a prior request submission, at least.
+ * FIXME: It seems the iPod video can get here and ignoring it
+ * allows the connection to succeed??
*/
if (num_active == 0)
- panicf("null ctrl req");
+ {
+ //panicf("null ctrl req");
+ return;
+ }
/*
* This can happen because an active request was already pending when