From mboxrd@z Thu Jan 1 00:00:00 1970 From: Doug Berger Subject: [PATCH net-next 0/2] net: bcmgenet: fix aborted suspend Date: Fri, 16 Nov 2018 18:00:20 -0800 Message-ID: <1542420022-30251-1-git-send-email-opendmb@gmail.com> Cc: Florian Fainelli , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, YueHaibing , Doug Berger To: "David S. Miller" Return-path: Received: from mail-pl1-f195.google.com ([209.85.214.195]:39041 "EHLO mail-pl1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727116AbeKQMP4 (ORCPT ); Sat, 17 Nov 2018 07:15:56 -0500 Sender: netdev-owner@vger.kernel.org List-ID: It is not enough to return an error code from the driver suspend routine. The driver must also restore the device functionality. This commit corrects the issue introduced by commit 0db55093b566 ("net: bcmgenet: return correct value 'ret' from bcmgenet_power_down") by calling the driver resume function if the suspend function returns an error. Doug Berger (2): net: bcmgenet: code movement net: bcmgenet: abort suspend on error drivers/net/ethernet/broadcom/genet/bcmgenet.c | 63 +++++++++++----------- drivers/net/ethernet/broadcom/genet/bcmgenet_wol.c | 6 +++ 2 files changed, 39 insertions(+), 30 deletions(-) -- 2.7.4