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: 9571847 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id DF97460586 for ; Tue, 14 Feb 2017 12:42:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CD30227C2D for ; Tue, 14 Feb 2017 12:42:56 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C1F4C283F2; Tue, 14 Feb 2017 12:42:56 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id ACEC9283A6 for ; Tue, 14 Feb 2017 12:42:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753823AbdBNMmq (ORCPT ); Tue, 14 Feb 2017 07:42:46 -0500 Received: from mail-lf0-f50.google.com ([209.85.215.50]:35357 "EHLO mail-lf0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753234AbdBNMmm (ORCPT ); Tue, 14 Feb 2017 07:42:42 -0500 Received: by mail-lf0-f50.google.com with SMTP id n124so65609014lfd.2 for ; Tue, 14 Feb 2017 04:42:36 -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=UfDgpwUg/8eMMiGDXQIcNGLBJ55dshInroNxPa5PtQoXkfvaTmvRN+V7+uJFsLOLug d9qCEcvPYCNGS7YccHXid1QpvP0T8l1eeFM6OUslyBnQfHRIyjrhGf2Hpvyeip8UXu5Z n28DiWXO0VWHrSjS3/J6IJQzMuFaudVpeP0lVuvGb8STqKZUrFE12KsWPnyfEh+fILDG 4Vdat1VOgUszu/Moma3Hj8WRmUIPth5mAywEd4VyBCv1Ni6ZOq7/gm8o7jvZjutNaO4D zR6zBjlmitR53PDosvj9i67qCvgO8jfXnM4baEmV3RanKKpHoLnpL70RXTtowbv8DVt+ ZAiA== X-Gm-Message-State: AMke39lVhGQmFtar9Xz8yMfdWPnTmOw1WAZQdLL2qWm5D070aOShhLZGL+nReDfiJRt9Yihd 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-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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(-) 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);