Received: by 2002:a05:6a10:413:0:0:0:0 with SMTP id 19csp1800660pxp; Mon, 7 Mar 2022 02:39:28 -0800 (PST) X-Google-Smtp-Source: ABdhPJyDzkU5XYNBM4B6b2WaoBImLK7t/y6gKFFwoQDpXWTMttLc/qQ/hcoPPtwPeYWWAkQ8pu8E X-Received: by 2002:a17:902:e552:b0:14f:bfec:eb2c with SMTP id n18-20020a170902e55200b0014fbfeceb2cmr11418263plf.108.1646649568195; Mon, 07 Mar 2022 02:39:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1646649568; cv=none; d=google.com; s=arc-20160816; b=DSPaMwCXgg9emDaRDrCJPVQnxQXA67d5UvOkvz6LdbP8ug59U732MlgVkQxH7AOBPb C1WVKEVDpzQrUEwxCqRzTTmglM/jZIlf7VZTE1gau9PZq/62xQY5MIovb9f+2Zp+gyJu XuCICKw2TdD6RQgsRlQRbN48JtkQ+HQW1+p35pI/sXxdp3k8+m0LGx18eOUOYkrFBWNc EoOMMFxb0UBcfzhVu8vymRBevnWXzsagkzGlknzFYgcG2J/aw53VtkHsA1oClLqN3sVm +PGwUlBf7UiOJPxhuNn51jYgyH/jlMaZehgYDBjXMrUU4jHQP1v+Qd/xweylvlxm940l nOJw== 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=mmrWI8UyBDK4fTObsz5vc0nndhTBn29Yk+wUPsDykFE=; b=gtY7LZgiL/aCBQs2z7axUvCSs+CVz7MshU6NjEALMqFKQCc/YsurxvclCk20BwrnMF xVam5H0XwcEgdDTVd4gNk6ALEKM9w/yGTqOGKSzD9jJulMmxEpmD4N8j+PVqWtXc7SSc iMJjQe7GLw+NBXhtaUlfczGzuoAzt8HjfwGpfqHO08hKDyNAIrBy1d6n41nXj0mxR8Z/ KOEZ5DYQG8MB6+QImJWirQFqg/iGXufFqTQFTTP40faqswoZWnwulUSUB8TcWl8XeNYl IelYdAgi22BVF57Rj2/n3f0x/f//hrzPrT/h4eLQGyD9F0i6lEKedQKhNP+kXBwQZ6mL jKig== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=FgsFor4d; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 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 out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id q23-20020a63f957000000b0034fcd64b735si11812298pgk.474.2022.03.07.02.38.58; Mon, 07 Mar 2022 02:39:28 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=FgsFor4d; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 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 S241650AbiCGKK0 (ORCPT + 99 others); Mon, 7 Mar 2022 05:10:26 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54002 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240476AbiCGJvD (ORCPT ); Mon, 7 Mar 2022 04:51:03 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3E6D566233; Mon, 7 Mar 2022 01:44:44 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 42B1D6116E; Mon, 7 Mar 2022 09:44:38 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 51E73C340F3; Mon, 7 Mar 2022 09:44:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1646646277; bh=fAJ+2iTmDQUbFg4aEvBcEPJGVGLafgqcagohjH7lv44=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FgsFor4dr4n8rJbSuMUeEo450KkYNNGGLKaachF7ZK9o/9p47QDtxLvA8tjjTCpA8 KJCKwXbbFgqi00xkWLNlSNHkDLtMcN8P2skmLSK1cP1J/8qY5bI1nfepW75W8FaGZy zx+SnwP7jLxgpwUO6HLHA9kTLcTtfmP9wPx73qS0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Corinna Vinschen , Sasha Neftin , Naama Meir , Tony Nguyen Subject: [PATCH 5.15 191/262] igc: igc_read_phy_reg_gpy: drop premature return Date: Mon, 7 Mar 2022 10:18:55 +0100 Message-Id: <20220307091707.914540928@linuxfoundation.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220307091702.378509770@linuxfoundation.org> References: <20220307091702.378509770@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Corinna Vinschen commit fda2635466cd26ad237e1bc5d3f6a60f97ad09b6 upstream. igc_read_phy_reg_gpy checks the return value from igc_read_phy_reg_mdic and if it's not 0, returns immediately. By doing this, it leaves the HW semaphore in the acquired state. Drop this premature return statement, the function returns after releasing the semaphore immediately anyway. Fixes: 5586838fe9ce ("igc: Add code for PHY support") Signed-off-by: Corinna Vinschen Acked-by: Sasha Neftin Tested-by: Naama Meir Signed-off-by: Tony Nguyen Signed-off-by: Greg Kroah-Hartman --- drivers/net/ethernet/intel/igc/igc_phy.c | 2 -- 1 file changed, 2 deletions(-) --- a/drivers/net/ethernet/intel/igc/igc_phy.c +++ b/drivers/net/ethernet/intel/igc/igc_phy.c @@ -779,8 +779,6 @@ s32 igc_read_phy_reg_gpy(struct igc_hw * if (ret_val) return ret_val; ret_val = igc_read_phy_reg_mdic(hw, offset, data); - if (ret_val) - return ret_val; hw->phy.ops.release(hw); } else { ret_val = igc_read_xmdio_reg(hw, (u16)offset, dev_addr,