From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753064AbbJZQ6S (ORCPT ); Mon, 26 Oct 2015 12:58:18 -0400 Received: from mail-wi0-f174.google.com ([209.85.212.174]:37112 "EHLO mail-wi0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752093AbbJZQzQ (ORCPT ); Mon, 26 Oct 2015 12:55:16 -0400 From: "Felipe F. Tonello" To: linux-usb@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Felipe Balbi , Greg Kroah-Hartman , Andrzej Pietrasiewicz , Clemens Ladisch Subject: [PATCH v4 1/7] usb: gadget: f_midi: Transmit data only when IN ep is enabled Date: Mon, 26 Oct 2015 16:55:03 +0000 Message-Id: <1445878509-12084-2-git-send-email-eu@felipetonello.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1445878509-12084-1-git-send-email-eu@felipetonello.com> References: <1445878509-12084-1-git-send-email-eu@felipetonello.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This makes sure f_midi doesn't try to enqueue data when the IN endpoint is disabled, ie, USB cable is disconnected. Signed-off-by: Felipe F. Tonello --- drivers/usb/gadget/function/f_midi.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/usb/gadget/function/f_midi.c b/drivers/usb/gadget/function/f_midi.c index edb84ca..e08f365 100644 --- a/drivers/usb/gadget/function/f_midi.c +++ b/drivers/usb/gadget/function/f_midi.c @@ -87,6 +87,7 @@ struct f_midi { int index; char *id; unsigned int buflen, qlen; + bool in_ep_enabled; }; static inline struct f_midi *func_to_midi(struct usb_function *f) @@ -332,6 +333,7 @@ static int f_midi_set_alt(struct usb_function *f, unsigned intf, unsigned alt) err = f_midi_start_ep(midi, f, midi->in_ep); if (err) return err; + midi->in_ep_enabled = true; err = f_midi_start_ep(midi, f, midi->out_ep); if (err) @@ -387,6 +389,8 @@ static void f_midi_disable(struct usb_function *f) */ usb_ep_disable(midi->in_ep); usb_ep_disable(midi->out_ep); + + midi->in_ep_enabled = false; } static int f_midi_snd_free(struct snd_device *device) @@ -543,7 +547,7 @@ static void f_midi_transmit(struct f_midi *midi, struct usb_request *req) } } - if (req->length > 0) { + if (req->length > 0 && midi->in_ep_enabled) { int err; err = usb_ep_queue(ep, req, GFP_ATOMIC); @@ -1158,6 +1162,7 @@ static struct usb_function *f_midi_alloc(struct usb_function_instance *fi) midi->index = opts->index; midi->buflen = opts->buflen; midi->qlen = opts->qlen; + midi->in_ep_enabled = false; ++opts->refcnt; mutex_unlock(&opts->lock); -- 2.1.4