From: Michał Mirosław Date: Thu, 28 May 2020 18:30:28 +0000 (+0200) Subject: usb: gadget: f_acm: don't disable disabled EP X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=e7a0ed3fa31be13a4bf5f81426cb4db560e031ee;p=linux.git usb: gadget: f_acm: don't disable disabled EP Make debugging real problems easier by not trying to disable an EP that was not yet enabled. Reviewed-by: Peter Chen Signed-off-by: Michał Mirosław Signed-off-by: Felipe Balbi --- diff --git a/drivers/usb/gadget/function/f_acm.c b/drivers/usb/gadget/function/f_acm.c index 200596ea9557c..46647bfac2ef8 100644 --- a/drivers/usb/gadget/function/f_acm.c +++ b/drivers/usb/gadget/function/f_acm.c @@ -425,9 +425,11 @@ static int acm_set_alt(struct usb_function *f, unsigned intf, unsigned alt) /* we know alt == 0, so this is an activation or a reset */ if (intf == acm->ctrl_id) { - dev_vdbg(&cdev->gadget->dev, - "reset acm control interface %d\n", intf); - usb_ep_disable(acm->notify); + if (acm->notify->enabled) { + dev_vdbg(&cdev->gadget->dev, + "reset acm control interface %d\n", intf); + usb_ep_disable(acm->notify); + } if (!acm->notify->desc) if (config_ep_by_speed(cdev->gadget, f, acm->notify))