From patchwork Sat Sep 15 01:33:38 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Yongjun X-Patchwork-Id: 970181 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=huawei.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 42BvmY0gvYz9sBJ for ; Sat, 15 Sep 2018 11:23:57 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727171AbeIOGkv (ORCPT ); Sat, 15 Sep 2018 02:40:51 -0400 Received: from szxga04-in.huawei.com ([45.249.212.190]:12141 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1725746AbeIOGkv (ORCPT ); Sat, 15 Sep 2018 02:40:51 -0400 Received: from DGGEMS413-HUB.china.huawei.com (unknown [172.30.72.58]) by Forcepoint Email with ESMTP id 2235E7BB61DEE; Sat, 15 Sep 2018 09:23:52 +0800 (CST) Received: from localhost.localdomain.localdomain (10.175.113.25) by DGGEMS413-HUB.china.huawei.com (10.3.19.213) with Microsoft SMTP Server id 14.3.399.0; Sat, 15 Sep 2018 09:23:45 +0800 From: Wei Yongjun To: Andrew Lunn , Vivien Didelot , Florian Fainelli , Hauke Mehrtens CC: Wei Yongjun , , Subject: [PATCH net-next] net: dsa: gswip: Fix copy-paste error in gswip_gphy_fw_probe() Date: Sat, 15 Sep 2018 01:33:38 +0000 Message-ID: <1536975218-185034-1-git-send-email-weiyongjun1@huawei.com> X-Mailer: git-send-email 1.8.3.1 MIME-Version: 1.0 X-Originating-IP: [10.175.113.25] X-CFilter-Loop: Reflected Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The return value from of_reset_control_array_get_exclusive() is not checked correctly. The test is done against a wrong variable. This patch fix it. Fixes: 14fceff4771e ("net: dsa: Add Lantiq / Intel DSA driver for vrx200") Signed-off-by: Wei Yongjun Acked-by: Hauke Mehrtens --- drivers/net/dsa/lantiq_gswip.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/dsa/lantiq_gswip.c b/drivers/net/dsa/lantiq_gswip.c index 9c28d0b..9c10570 100644 --- a/drivers/net/dsa/lantiq_gswip.c +++ b/drivers/net/dsa/lantiq_gswip.c @@ -934,10 +934,10 @@ static int gswip_gphy_fw_probe(struct gswip_priv *priv, } gphy_fw->reset = of_reset_control_array_get_exclusive(gphy_fw_np); - if (IS_ERR(priv->gphy_fw)) { - if (PTR_ERR(priv->gphy_fw) != -EPROBE_DEFER) + if (IS_ERR(gphy_fw->reset)) { + if (PTR_ERR(gphy_fw->reset) != -EPROBE_DEFER) dev_err(dev, "Failed to lookup gphy reset\n"); - return PTR_ERR(priv->gphy_fw); + return PTR_ERR(gphy_fw->reset); } return gswip_gphy_fw_load(priv, gphy_fw);