diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c
index 9622514e3df9..9d795489c285 100644
--- a/drivers/usb/gadget/composite.c
+++ b/drivers/usb/gadget/composite.c
@@ -2470,6 +2470,7 @@ void usb_composite_setup_continue(struct usb_composite_dev *cdev)
 		}
 		spin_unlock_irqrestore(&cdev->lock, flags);
 		WARN(cdev, "%s: Unexpected call\n", __func__);
+		return;
 
 	} else if (--cdev->delayed_status == 0) {
 		DBG(cdev, "%s: Completing delayed status\n", __func__);