diff --git a/esphome/components/usb_host/usb_host_client.cpp b/esphome/components/usb_host/usb_host_client.cpp index d18b90b790..b26385a8ef 100644 --- a/esphome/components/usb_host/usb_host_client.cpp +++ b/esphome/components/usb_host/usb_host_client.cpp @@ -363,7 +363,7 @@ TransferRequest *USBClient::get_trq_() { // Find first available slot (bit = 0) and try to claim it atomically // We use a while loop to allow retrying the same slot after CAS failure size_t i = 0; - while (i < MAX_REQUESTS) { + while (i != MAX_REQUESTS) { if (mask & (1U << i)) { // Slot is in use, move to next slot i++; @@ -371,11 +371,9 @@ TransferRequest *USBClient::get_trq_() { } // Slot i appears available, try to claim it atomically - uint16_t expected = mask; uint16_t desired = mask | (1U << i); // Set bit i to mark as in-use - if (this->trq_in_use_.compare_exchange_weak(expected, desired, std::memory_order_acquire, - std::memory_order_relaxed)) { + if (this->trq_in_use_.compare_exchange_weak(mask, desired, std::memory_order_acquire, std::memory_order_relaxed)) { // Successfully claimed slot i - prepare the TransferRequest auto *trq = &this->requests_[i]; trq->transfer->context = trq; @@ -383,8 +381,8 @@ TransferRequest *USBClient::get_trq_() { return trq; } // CAS failed - another thread modified the bitmask - // Restart search from the beginning with the updated mask - mask = this->trq_in_use_.load(std::memory_order_relaxed); + // mask was already updated by compare_exchange_weak with the current value + // No need to reload - the CAS already did that for us i = 0; }