Received: by 2002:a05:6a10:c604:0:0:0:0 with SMTP id y4csp3773526pxt; Tue, 10 Aug 2021 11:00:55 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxG0ZfMinWozQnqUnzkQw3DfxT7cS+9+EuWGKgImnDWhlDVoX5oCUU85DnamV5xTfQg6cgX X-Received: by 2002:a6b:8f4a:: with SMTP id r71mr286844iod.12.1628618455690; Tue, 10 Aug 2021 11:00:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1628618455; cv=none; d=google.com; s=arc-20160816; b=STB1ZhB5bE/15gnGNPdzQYajPkYaDyFgJoxe7DDYw+Yq4iuOywDKRVrBFnd6ts3vJ1 Tki1QhxkzEdmcMHTQ0TKt/iUDJpnEhYtTeqd+t8VBD56KDrxTwOt9p3LBUQim5qHia8A DEmIsTWUk9FsB/xDgi77414eANgIX6Ir1VL40FAw4Rw4Rshr3OIyg8Pxpd807tGoz3Da +45LG9V+upxe8Vcg0uAsPxL6/SueLy0+HpF85LlwPKbPvAZjp1FlVWlMskZEL31mmnHj f+BkbUQzNCIvtpyptJTtsmBnsWT0AO+Y18YI+tAeC8vH0nhPQTo7Eo1oeVtAWzGTOP7P 22eQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=xwqYcuuV4+dd3WuXp3pw53RhllEyu3KApB9GHpNnqbM=; b=D+Gm8qgrizvTlA8rNhCJ4clLV03SiamNQEBshSfshQkXx8FqwJ7K6Ken7bJOUCAVZS nVcI8pXJcl58WMqAQNnwa1uVcVYg4dHUFI9yCnE6cF8/XnkKxkJIQ2gVsQK/r8OftQ8i bTmKXWIxaCf3sXPhEsN4Uv+zxvgqnSUN/Dga99eNHUVikOtXjXRKh/KdEx5Fg+4nXdQG Sn/owp7zyOUPZIeEwEbrAxnkRVrvibIOtAo9s5B7LYO65IVWD7UayvreVKYqkGHOkjjE uJhTPQWqYQR9UIcjcU0PitJgKCUXsI+pQqByyGrHrluWLkmLkFYObYtlD2WW+WqAPrwR yqcw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=tybUmUya; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id z10si416196jap.49.2021.08.10.11.00.44; Tue, 10 Aug 2021 11:00:55 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=tybUmUya; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238652AbhHJR7u (ORCPT + 99 others); Tue, 10 Aug 2021 13:59:50 -0400 Received: from mail.kernel.org ([198.145.29.99]:59202 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237041AbhHJR4s (ORCPT ); Tue, 10 Aug 2021 13:56:48 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 963006137F; Tue, 10 Aug 2021 17:45:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1628617515; bh=2Y3Qp3G5mENTpc2REOidP74dQvh1947DMC9bw/PxA+8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tybUmUyaB85XAo3unIMfRFJxZcfQhompnWqniOyViSVTbfRHM2xj71+W4ZcMJkYh1 il3koR5J0/Xw1bYi5zw0UdXXA7z2CVIEzbBfCrAKpx2Uz6vvayMZ8tBfn3+ymxlwF/ RImSZUkej/EShK4l426XUnvwpq0QrRdWrRcWzj2U= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Felipe Balbi , Zhang Qilong Subject: [PATCH 5.13 091/175] usb: gadget: remove leaked entry from udc driver list Date: Tue, 10 Aug 2021 19:29:59 +0200 Message-Id: <20210810173003.945438751@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210810173000.928681411@linuxfoundation.org> References: <20210810173000.928681411@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Zhang Qilong commit fa4a8dcfd51b911f101ebc461dfe22230b74dd64 upstream. The usb_add_gadget_udc will add a new gadget to the udc class driver list. Not calling usb_del_gadget_udc in error branch will result in residual gadget entry in the udc driver list. We fix it by calling usb_del_gadget_udc to clean it when error return. Fixes: 48ba02b2e2b1 ("usb: gadget: add udc driver for max3420") Acked-by: Felipe Balbi Signed-off-by: Zhang Qilong Link: https://lore.kernel.org/r/20210727073142.84666-1-zhangqilong3@huawei.com Cc: stable Signed-off-by: Greg Kroah-Hartman --- drivers/usb/gadget/udc/max3420_udc.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) --- a/drivers/usb/gadget/udc/max3420_udc.c +++ b/drivers/usb/gadget/udc/max3420_udc.c @@ -1260,12 +1260,14 @@ static int max3420_probe(struct spi_devi err = devm_request_irq(&spi->dev, irq, max3420_irq_handler, 0, "max3420", udc); if (err < 0) - return err; + goto del_gadget; udc->thread_task = kthread_create(max3420_thread, udc, "max3420-thread"); - if (IS_ERR(udc->thread_task)) - return PTR_ERR(udc->thread_task); + if (IS_ERR(udc->thread_task)) { + err = PTR_ERR(udc->thread_task); + goto del_gadget; + } irq = of_irq_get_byname(spi->dev.of_node, "vbus"); if (irq <= 0) { /* no vbus irq implies self-powered design */ @@ -1285,10 +1287,14 @@ static int max3420_probe(struct spi_devi err = devm_request_irq(&spi->dev, irq, max3420_vbus_handler, 0, "vbus", udc); if (err < 0) - return err; + goto del_gadget; } return 0; + +del_gadget: + usb_del_gadget_udc(&udc->gadget); + return err; } static int max3420_remove(struct spi_device *spi)