From patchwork Mon Oct 24 11:29:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 8900 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp433918wru; Mon, 24 Oct 2022 05:50:53 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7iYTVEGYp6GdBqFUE+aXhLi9GqyKuasLJxLqxmK7zJsLLsR0l36suytMAAu/+KJSChRN8Y X-Received: by 2002:a05:6402:3547:b0:45d:1578:9424 with SMTP id f7-20020a056402354700b0045d15789424mr29874494edd.281.1666615853748; Mon, 24 Oct 2022 05:50:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666615853; cv=none; d=google.com; s=arc-20160816; b=0YQRoNgRBPDhPTjCwmC+ZLQ+3e/UDAKoMwD51CiR56h7W3N4bN8VfJ3xeeSLUrESuw awZDz7dCORKbsrO5mMMIrJ6MnQfYZCkAxyPcq+JS/WgmNaEPw3NX6XyGpyrH6i9PZCv+ tHhmrx8HCsISCyZH/1dMzG+pTkl0a/9iqWthr+3WFTlGCvTl1uaPHAAiIoqbtoVUFqEq jHtBcdaTN8gxnjA3y41qNBVNky2wtkt1tav6/mpHOF68s7cJYmJJZdjMz7rVqmvo3cKx QcpXmEZHG5Bogl9V8VsclvAcGxzqTLyw8p8Q5WTAkQywnnw6wgqbfEqafTucQDqaCI7P XK4Q== 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=2faJEEOkcg0BFFaPon09pTeCWDOh8zjLxsdn9OWF0Hw=; b=SyG4E9bzpDOX/FrMyKKr9ZMxKAjXpQ6VieFH1lyxidheZmcNhmsH7lqlx7pMQFtCEy nGI4MVUrPZRBowj1TvmpDmK+uapVF97VdRAy+cg2+eqeqq0xF4lv8C4O2g4GfvAaC7nF wMvQJPnKcVk4SW/XsaXWLGzYqpFDiZ/V2RwhvDofxRw6IhlqXh0gmmrgFVstk4KjZRqt 9QnuV8dFp69AUgOKdk6mrm4H9EH7lxafojUQOeK5MqiyHPzFkztmnO/xEt/rm6gKT1HF n6yvNLcf5LHBKPh1zPvxuL9wrAIs+f7c0rBf6NIz0/Lf166xHnyoOIFWvSOnUzTx/YaU J/OQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=taZFGTrX; 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: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id di13-20020a170906730d00b0078d1e08f1e5si27754864ejc.919.2022.10.24.05.50.27; Mon, 24 Oct 2022 05:50:53 -0700 (PDT) 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=taZFGTrX; 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 S234731AbiJXMtW (ORCPT + 99 others); Mon, 24 Oct 2022 08:49:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37810 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234449AbiJXMow (ORCPT ); Mon, 24 Oct 2022 08:44:52 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 56CB72665; Mon, 24 Oct 2022 05:09:26 -0700 (PDT) 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 99110612A4; Mon, 24 Oct 2022 12:07:49 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id AC17CC433D6; Mon, 24 Oct 2022 12:07:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666613269; bh=deb/+f+bTm4Ytyvf8OL7N3yZQGGpLOBi7QxH7ZECr8U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=taZFGTrXUfQgmbxN62EfzcStndxifyxZyaz+A+34iDfy8LYwgb8AyOrVGhwomPSUu 7B1kf686Q18xJnsmE+t5YEb+W55ZLPFeyt+YEui5VDylRv4ZYrUKLp8w/JJN9uE+2k g7xnaWJeYkvxk7sUXfyqFUp2xshbGPfKkFWiS37k= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Zheng Yongjun , Christophe Leroy , "David S. Miller" , Sasha Levin Subject: [PATCH 5.4 073/255] net: fs_enet: Fix wrong check in do_pd_setup Date: Mon, 24 Oct 2022 13:29:43 +0200 Message-Id: <20221024113004.933567582@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024113002.471093005@linuxfoundation.org> References: <20221024113002.471093005@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 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 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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747573385806235005?= X-GMAIL-MSGID: =?utf-8?q?1747573385806235005?= From: Zheng Yongjun [ Upstream commit ec3f06b542a960806a81345042e4eee3f8c5dec4 ] Should check of_iomap return value 'fep->fec.fecp' instead of 'fep->fcc.fccp' Fixes: 976de6a8c304 ("fs_enet: Be an of_platform device when CONFIG_PPC_CPM_NEW_BINDING is set.") Signed-off-by: Zheng Yongjun Reviewed-by: Christophe Leroy Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/freescale/fs_enet/mac-fec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/freescale/fs_enet/mac-fec.c b/drivers/net/ethernet/freescale/fs_enet/mac-fec.c index 99fe2c210d0f..61f4b6e50d29 100644 --- a/drivers/net/ethernet/freescale/fs_enet/mac-fec.c +++ b/drivers/net/ethernet/freescale/fs_enet/mac-fec.c @@ -98,7 +98,7 @@ static int do_pd_setup(struct fs_enet_private *fep) return -EINVAL; fep->fec.fecp = of_iomap(ofdev->dev.of_node, 0); - if (!fep->fcc.fccp) + if (!fep->fec.fecp) return -EINVAL; return 0;