From patchwork Tue Feb 14 12:42:15 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ivan Khoronzhuk X-Patchwork-Id: 93960 Delivered-To: patch@linaro.org Received: by 10.140.20.99 with SMTP id 90csp1540480qgi; Tue, 14 Feb 2017 04:42:32 -0800 (PST) X-Received: by 10.99.99.5 with SMTP id x5mr32422883pgb.225.1487076152700; Tue, 14 Feb 2017 04:42:32 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id e8si393343pgp.204.2017.02.14.04.42.32; Tue, 14 Feb 2017 04:42:32 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753814AbdBNMm3 (ORCPT + 25 others); Tue, 14 Feb 2017 07:42:29 -0500 Received: from mail-lf0-f52.google.com ([209.85.215.52]:36069 "EHLO mail-lf0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753253AbdBNMm1 (ORCPT ); Tue, 14 Feb 2017 07:42:27 -0500 Received: by mail-lf0-f52.google.com with SMTP id z134so65654127lff.3 for ; Tue, 14 Feb 2017 04:42:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=/AuVDJT03+tHqaJM48NWTmXw7CLLax4dLBM24mtZ+RI=; b=W2n52mLKfDwjJXEfVw1VnVaIpu2+/WqOhyMp+XPz4wDOndt1YMpAeGKzVGekIyRAQS ahirH9PWg3gat6bx1dGinm58FPjiEVTHAGf5A38WImBdciCH3zEHOK4OCXcZzFBbTj+7 Hp7RQtTxPp7kvNGWDMfcMm387IzGonUcFukOU= 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=/AuVDJT03+tHqaJM48NWTmXw7CLLax4dLBM24mtZ+RI=; b=k1qQ8Kks0h4ewL0SjEYQNedSNAcoP8VYjteNWgA/C6FAiNxG14XQV7ruvqoKAyHN0U Fl66S0OMmqGBBnQujwQAsLPXtcNRanb1KCg6Yn/1dyfZRmj/Dn43b/ng1v7t8VehcH9B wGJCRqeiDLKLZu+WymBhXgFpxYSlHotJrvoI8LQlWWchZkHrPodxS6kmvmP0U7YvQlch H/DodcRnRzkCqpPYWegHcM2RMi3pZ8eUCsmqv8ffQ4iu0TJ45LWy/OjqdDcTfKTBdJll kXfDm/rgksuB9xPfSIgYozZY1b23FKwaMCSYCq8cPd5xUCj9BycAfVa3UHDLSqlDNJ/1 2afg== X-Gm-Message-State: AMke39ke/89UcxP342pCxUJFZpjrAJEoRWhe1sX0BBuXX8Q1oLPV/J21Z03vicYvGQUF2qwL X-Received: by 10.25.138.136 with SMTP id m130mr9174844lfd.134.1487076140220; Tue, 14 Feb 2017 04:42:20 -0800 (PST) Received: from localhost.localdomain (183-224-132-95.pool.ukrtel.net. [95.132.224.183]) by smtp.gmail.com with ESMTPSA id a16sm109758lfk.64.2017.02.14.04.42.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 14 Feb 2017 04:42:19 -0800 (PST) From: Ivan Khoronzhuk To: mugunthanvnm@ti.com Cc: grygorii.strashko@ti.com, netdev@vger.kernel.org, linux-omap@vger.kernel.org, linux-kernel@vger.kernel.org, Ivan Khoronzhuk Subject: [PATCH v2] net: ethernet: ti: cpsw: fix cpsw assignment in resume Date: Tue, 14 Feb 2017 14:42:15 +0200 Message-Id: <1487076135-4798-1-git-send-email-ivan.khoronzhuk@linaro.org> X-Mailer: git-send-email 2.7.4 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org There is a copy-paste error, which hides breaking of resume for CPSW driver: there was replaced netdev_priv() to ndev_to_cpsw(ndev) in suspend, but left it unchanged in resume. Fixes: 606f39939595a4d4540406bfc11f265b2036af6d (ti: cpsw: move platform data and slaves info to cpsw_common) Reported-by: Alexey Starikovskiy Signed-off-by: Ivan Khoronzhuk --- Based on net/master v1: https://patchwork.ozlabs.org/patch/725876/ Since v1: - rebased on net/master drivers/net/ethernet/ti/cpsw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.7.4 diff --git a/drivers/net/ethernet/ti/cpsw.c b/drivers/net/ethernet/ti/cpsw.c index b203143..6508822 100644 --- a/drivers/net/ethernet/ti/cpsw.c +++ b/drivers/net/ethernet/ti/cpsw.c @@ -3160,7 +3160,7 @@ static int cpsw_resume(struct device *dev) { struct platform_device *pdev = to_platform_device(dev); struct net_device *ndev = platform_get_drvdata(pdev); - struct cpsw_common *cpsw = netdev_priv(ndev); + struct cpsw_common *cpsw = ndev_to_cpsw(ndev); /* Select default pin state */ pinctrl_pm_select_default_state(dev);