OSDN Git Service

Merge branch 'bcmgenet-fix-aborted-suspend'
authorDavid S. Miller <davem@davemloft.net>
Sun, 18 Nov 2018 06:04:39 +0000 (22:04 -0800)
committerDavid S. Miller <davem@davemloft.net>
Sun, 18 Nov 2018 06:04:39 +0000 (22:04 -0800)
commit17bf1693a6877c9f828404608e9c4a84c558c79f
tree7c6cb635b310c7f7d0b94f0732a81653c3ec50ac
parent8a962c4aa1e6c0836985a5843f44d74fe3cced12
parentc5a54bbcececa36852807c36157a86d808b62310
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 <davem@davemloft.net>