From efa261ba48a88309763a0b07bf299035660180c6 Mon Sep 17 00:00:00 2001
From: Brad Stein <Brad.Stein@gmail.com>
Date: Fri, 9 Jan 2026 17:55:25 -0300
Subject: [PATCH] core: skip reset when gadget bound

---
 scripts/daemon/lesavka-core.sh | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/scripts/daemon/lesavka-core.sh b/scripts/daemon/lesavka-core.sh
index 0cb2e51..892aadb 100644
--- a/scripts/daemon/lesavka-core.sh
+++ b/scripts/daemon/lesavka-core.sh
@@ -96,7 +96,13 @@ case "${1:-}" in
         ;;
 esac
 
-cleanup() { echo "" >"$G/UDC" 2>/dev/null || true; }
+cleanup() {
+    if [[ -n ${LESAVKA_ALLOW_GADGET_RESET:-} ]]; then
+        LESAVKA_DETACH_CLEAR_UDC=1 detach_gadget
+    else
+        detach_gadget
+    fi
+}
 
 DISABLE_UAC=${LESAVKA_DISABLE_UAC:-}
 DISABLE_UVC=${LESAVKA_DISABLE_UVC:-}
@@ -186,6 +192,17 @@ fi
 [[ -n $UDC ]] || { log "❌ UDC not present after manual bind"; exit 1; }
 log "✅ UDC detected: $UDC"
 
+# Guard against lockups: if the gadget is already bound, don't reset unless forced.
+BOUND_UDC=""
+if [[ -r $G/UDC ]]; then
+    BOUND_UDC=$(cat "$G/UDC" 2>/dev/null || true)
+fi
+if [[ -n $BOUND_UDC && -z ${LESAVKA_ALLOW_GADGET_RESET:-} ]]; then
+    log "🔒 gadget already bound to '$BOUND_UDC' - refusing reset."
+    log "    Set LESAVKA_ALLOW_GADGET_RESET=1 to force."
+    exit 0
+fi
+
 # Guard against lockups: don't reset gadget while host is attached unless forced.
 UDC_STATE="$(udc_state "$UDC")"
 if [[ -z ${LESAVKA_ALLOW_GADGET_RESET:-} ]] && is_attached_state "$UDC_STATE"; then