From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753926AbcBWPGQ (ORCPT ); Tue, 23 Feb 2016 10:06:16 -0500 Received: from mail-qg0-f46.google.com ([209.85.192.46]:35103 "EHLO mail-qg0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752020AbcBWPGL (ORCPT ); Tue, 23 Feb 2016 10:06:11 -0500 From: Diego Viola To: cooldavid@cooldavid.org Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, richard.weinberger@gmail.com, pavel@ucw.cz, rjw@rjwysocki.net, davem@davemloft.net, valdis.kletnieks@vt.edu, Diego Viola Subject: [PATCH v3] net: jme: fix suspend/resume on JMC260 Date: Tue, 23 Feb 2016 12:04:04 -0300 Message-Id: <1456239844-4109-1-git-send-email-diego.viola@gmail.com> X-Mailer: git-send-email 2.7.1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The JMC260 network card fails to suspend/resume because the call to jme_start_irq() was too early, moving the call to jme_start_irq() after the call to jme_reset_link() makes it work. Prior this change suspend/resume would fail unless /sys/power/pm_async=0 was explicitly specified. Relevant bug report: https://bugzilla.kernel.org/show_bug.cgi?id=112351 Signed-off-by: Diego Viola --- drivers/net/ethernet/jme.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/jme.c b/drivers/net/ethernet/jme.c index b1de7af..8adbe8f 100644 --- a/drivers/net/ethernet/jme.c +++ b/drivers/net/ethernet/jme.c @@ -3312,13 +3312,14 @@ jme_resume(struct device *dev) jme_reset_phy_processor(jme); jme_phy_calibration(jme); jme_phy_setEA(jme); - jme_start_irq(jme); netif_device_attach(netdev); atomic_inc(&jme->link_changing); jme_reset_link(jme); + jme_start_irq(jme); + return 0; } -- 2.7.1