Received: by 2002:a05:6a10:413:0:0:0:0 with SMTP id 19csp1784970pxp; Mon, 7 Mar 2022 02:15:10 -0800 (PST) X-Google-Smtp-Source: ABdhPJzjmWN0zPAj7ME2pcyfwSxu2EgvK8rDwJ/EBM0FYyILdF9nIB6aqt1bTZQJEUvigssrYw4M X-Received: by 2002:a17:907:1b1e:b0:6d7:31b0:e821 with SMTP id mp30-20020a1709071b1e00b006d731b0e821mr8580674ejc.334.1646648110607; Mon, 07 Mar 2022 02:15:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1646648110; cv=none; d=google.com; s=arc-20160816; b=hFYBXX6eJC+wvMKKnbyjnV45rhTYxm91odISY5rnlVSKjZtNNMBDCvy7qNm21FP3Fs 0tYhRjoM1VCK38py97RFSAL60OYrPMVW/ZEsRMbEq/Xtx7byaqmMXp3Cr5DbFHpOyaRj BCoax+VCIBbdFwAZB4jFDK+vxBi2m9nUSgZpWGAm/7fZpz/t8Is/rxaejEI0QUSg68GC 24C3VrgCaJG52/zHADOIhcOnDw2szDVpmLe5dQC468t6C0O2tioHjV5o2XH0N0BuehwZ Cv3xGzkbgDAF0Rx81a9KVsqiMVlM2C06wxg78RhmMYNEMxFNSObTJ5uAP7hgz8dbIdjX +YJQ== 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=JN4KaudB92Rnnw6G5Wm1VHdTjiGIyvRKwZ78/bpRjZ4=; b=0J6vgqTGv4U3grSSlNh8+eLZtqlzxpBXNHk++SlyDJO0u+msdRV4LUvIA3Dgpnniz/ LP2dhvZjAuDSgUYDhLYRFsAOkh0VPPFuvn8wQM85yRUDpFfwUnNNC7BbI3zRVyK5bVSX kuQWgxyokulkdH6VwcGLRH2cGzva0p2s/6MgcmVLYnFl75FHGI82GLJF81DwnPkISDa2 GLc8kqR+6XkngrJYDTG0hO7rruY52YC9PrMicV96mrviggIcjtSpQct/fKjWouSwV0ch aYGr1RvRehOr++0XijoYyi2rE7zpVNwrAhhvfYhdz4Cz5QRFfVI3XvZB03JS5H7IZC37 xC7w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=oRFiLNbJ; 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 sc7-20020a1709078a0700b006dae9edcdfasi5649257ejc.593.2022.03.07.02.14.48; Mon, 07 Mar 2022 02:15:10 -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=oRFiLNbJ; 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 S238292AbiCGJrj (ORCPT + 99 others); Mon, 7 Mar 2022 04:47:39 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54400 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238508AbiCGJib (ORCPT ); Mon, 7 Mar 2022 04:38:31 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1DD854249F; Mon, 7 Mar 2022 01:32:49 -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 ams.source.kernel.org (Postfix) with ESMTPS id 37057B810C0; Mon, 7 Mar 2022 09:32:48 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 699F1C340F5; Mon, 7 Mar 2022 09:32:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1646645566; bh=zEsng+QabY6S/u4Deg/8fZ5H1jLxZcEmj/N6Lvj1rzM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=oRFiLNbJKiStHkqdlQ4euEkMmGofoyGoua3wiDMDGK+geEIR7eAbwRredaBwRPYGL IpILAobuYaR8vG3H9oH+zKahiF4xyM1NWnXXWc1GDG5pOKmbXfvzOK61xI/ojML/sj CjZwx9md9o76VQNtr1ERfxlyZ+O+cGHf5hWEGK94= 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.10 073/105] igc: igc_read_phy_reg_gpy: drop premature return Date: Mon, 7 Mar 2022 10:19:16 +0100 Message-Id: <20220307091646.231838760@linuxfoundation.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220307091644.179885033@linuxfoundation.org> References: <20220307091644.179885033@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 @@ -781,8 +781,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,