From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6E806C32792 for ; Thu, 3 Oct 2019 16:54:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3A5EB2054F for ; Thu, 3 Oct 2019 16:54:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1570121654; bh=RfXH2R0qAeSJaNuWcnYsp87QYBShJznj5iJicT3pyXQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=hv2GTF2MwfZ3awtpuj1ed3fzsAdaG3QVK+U5ie9PBmwNYcYP4m1LxKH4t6g24oNyx lbfLr5zBBjdO8IM/Ns5sx/EjV6tIRLjcNf0DMV2B2w+p0KD1DzgRtM+iL5OWnkz4dk l69WfmOYGbuy1Ij5JNhiO6HYm+5roCjysEI1FohI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2406443AbfJCQyN (ORCPT ); Thu, 3 Oct 2019 12:54:13 -0400 Received: from mail.kernel.org ([198.145.29.99]:42006 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2393232AbfJCQxt (ORCPT ); Thu, 3 Oct 2019 12:53:49 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id D193A2070B; Thu, 3 Oct 2019 16:53:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1570121628; bh=RfXH2R0qAeSJaNuWcnYsp87QYBShJznj5iJicT3pyXQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=E4fPJOgtr/iQNt0ViePCz5GmKa7v3IPqq6XYxh4X/IfDqISExpA/fYeQBOdlNvJFu SgqtNouLlQkZeNYtWQEHL0tFcsylxyK1n46nnyuNT0cLIfo3Az2sKysnk4NYWLa/9f e5lW/LxFxFYVPce+FQ59NzImj1keHr7sCkJdF8LQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Lorenzo Bianconi , Felix Fietkau , Sasha Levin Subject: [PATCH 5.3 342/344] mt76: mt7615: always release sem in mt7615_load_patch Date: Thu, 3 Oct 2019 17:55:07 +0200 Message-Id: <20191003154612.157543944@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191003154540.062170222@linuxfoundation.org> References: <20191003154540.062170222@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Lorenzo Bianconi [ Upstream commit 2fc446487c364bf8bbd5f8f5f27e52d914fa1d72 ] Release patch semaphore even if request_firmware fails in mt7615_load_patch Signed-off-by: Lorenzo Bianconi Signed-off-by: Felix Fietkau Signed-off-by: Sasha Levin --- drivers/net/wireless/mediatek/mt76/mt7615/mcu.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c index cdad2c8dc2971..7ef681fea3f8f 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c +++ b/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c @@ -257,9 +257,9 @@ static int mt7615_driver_own(struct mt7615_dev *dev) static int mt7615_load_patch(struct mt7615_dev *dev) { - const struct firmware *fw; - const struct mt7615_patch_hdr *hdr; const char *firmware = MT7615_ROM_PATCH; + const struct mt7615_patch_hdr *hdr; + const struct firmware *fw = NULL; int len, ret, sem; sem = mt7615_mcu_patch_sem_ctrl(dev, 1); @@ -275,7 +275,7 @@ static int mt7615_load_patch(struct mt7615_dev *dev) ret = request_firmware(&fw, firmware, dev->mt76.dev); if (ret) - return ret; + goto out; if (!fw || !fw->data || fw->size < sizeof(*hdr)) { dev_err(dev->mt76.dev, "Invalid firmware\n"); -- 2.20.1