From: David S. Miller Date: Sun, 18 Nov 2018 06:04:39 +0000 (-0800) Subject: Merge branch 'bcmgenet-fix-aborted-suspend' X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=17bf1693a6877c9f828404608e9c4a84c558c79f;p=openwrt%2Fstaging%2Fblogic.git Merge branch 'bcmgenet-fix-aborted-suspend' Doug Berger says: ==================== net: bcmgenet: fix aborted suspend 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. ==================== Signed-off-by: David S. Miller --- 17bf1693a6877c9f828404608e9c4a84c558c79f