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.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 EBDB9C04AB6 for ; Tue, 28 May 2019 12:34:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C2096208C3 for ; Tue, 28 May 2019 12:34:02 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="Bzdfa6+S" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727251AbfE1MeC (ORCPT ); Tue, 28 May 2019 08:34:02 -0400 Received: from mail-lj1-f194.google.com ([209.85.208.194]:45104 "EHLO mail-lj1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727160AbfE1Md6 (ORCPT ); Tue, 28 May 2019 08:33:58 -0400 Received: by mail-lj1-f194.google.com with SMTP id r76so6728768lja.12 for ; Tue, 28 May 2019 05:33:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=p6KdJeiH86xgZo1O+1oE/uG9And6c5wGK5T3gqfY/Xo=; b=Bzdfa6+SY9BtK9NQo8gyteSgCIx5YWOdqoxK2BqFQ36uCyO8H8Afo1OyBE3Asf6tR1 ECLkWPcB+CABwlIM3oYkUYAK2AXvqNg4ZByJroQbuW6Je5hSqjFQNFLPg4afIVlSF2Lh 2YWcPYfVMLFPYI3fBZ6WurO7Ua4cCfuy7BBxdj6w9meNfhIrueMfnPx/LU9ORY9hICR/ DQ1oiufcthmcCqA1PZAIf0EFNlwH/7/TGJ+JK7LciN844pvc6dTKPKarjiR046byN8N8 nMsX8SBKdOWAckmbMmfBBQd81xA3hyvnPru7j5IJu+2DLxrhK0VUosmjdEGO+kgOOOOq Gu2g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=p6KdJeiH86xgZo1O+1oE/uG9And6c5wGK5T3gqfY/Xo=; b=EAi1C7gY1Y4wHzGu3tM8cRl7HpgxgjsuuEg3RqJhbfs6/cpqmcrsy1ILwZLj6cZYZA NuObNXwtd65QQm6Y/A7lQY3Y7q+2ABLNCTkJdmLAxO1x2USAnwvXUVemSuRah5o4DqZ2 5GH5kxXixFVeQ7JEdC1N9NckK10xpr90hcIZlx/XOqH+DPbfRrKDe3cwl6qsTZAass0G teZ7PZhy4OI8eDveb6zyiW9E2czIVBDTqXB5pE9uiB9+CxycAxEQvn9i5m0YWzCfQD0B njGO64vUHYTnwMjlG7MPKc+sJXbRvLC2M25u0FvRtBUPiIf2X3NgM6Z8sziUWUbp31CT drLQ== X-Gm-Message-State: APjAAAVfMDMLSnQANhPyjKpUn9TVbITBpLDoKqZup/Px+mIAX53bGQKs OY5W5CRJ1QUretHPXMQF8RZ+EQ== X-Google-Smtp-Source: APXvYqzJ+0rB51Qa07OsbyNptlPHB5eRfiy8UqDDQS7y2JlFBlJFdKgzpmI0REFejzLZXr8nSaO2Rg== X-Received: by 2002:a2e:6c0b:: with SMTP id h11mr29242008ljc.15.1559046835818; Tue, 28 May 2019 05:33:55 -0700 (PDT) Received: from localhost.localdomain (59-201-94-178.pool.ukrtel.net. [178.94.201.59]) by smtp.gmail.com with ESMTPSA id y14sm2905662ljh.60.2019.05.28.05.33.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 28 May 2019 05:33:55 -0700 (PDT) From: Ivan Khoronzhuk To: grygorii.strashko@ti.com Cc: davem@davemloft.net, linux-omap@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Ivan Khoronzhuk Subject: [PATCH net-next] net: ethernet: ti: cpsw: correct .ndo_open error path Date: Tue, 28 May 2019 15:33:52 +0300 Message-Id: <20190528123352.21505-1-ivan.khoronzhuk@linaro.org> X-Mailer: git-send-email 2.17.1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org It's found while review and probably never happens, but real number of queues is set per device, and error path should be per device. Also correct label name for shared error path. Signed-off-by: Ivan Khoronzhuk --- drivers/net/ethernet/ti/cpsw.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/ti/cpsw.c b/drivers/net/ethernet/ti/cpsw.c index 634fc484a0b3..473d25ed59e3 100644 --- a/drivers/net/ethernet/ti/cpsw.c +++ b/drivers/net/ethernet/ti/cpsw.c @@ -1399,7 +1399,7 @@ static int cpsw_ndo_open(struct net_device *ndev) ret = cpsw_fill_rx_channels(priv); if (ret < 0) - goto err_cleanup; + goto err_shared_cleanup; if (cpts_register(cpsw->cpts)) dev_err(priv->dev, "error registering cpts device\n"); @@ -1422,9 +1422,10 @@ static int cpsw_ndo_open(struct net_device *ndev) return 0; -err_cleanup: +err_shared_cleanup: cpdma_ctlr_stop(cpsw->dma); for_each_slave(priv, cpsw_slave_stop, cpsw); +err_cleanup: pm_runtime_put_sync(cpsw->dev); netif_carrier_off(priv->ndev); return ret; -- 2.17.1