|
@@ -15,8 +15,6 @@ Signed-off-by: Pawel Dembicki <[email protected]>
|
|
|
drivers/power/reset/linkstation-poweroff.c | 35 ++++++++++++++++++----
|
|
|
1 file changed, 29 insertions(+), 6 deletions(-)
|
|
|
|
|
|
-diff --git a/drivers/power/reset/linkstation-poweroff.c b/drivers/power/reset/linkstation-poweroff.c
|
|
|
-index f1e843df0e16..8691cf98600d 100644
|
|
|
--- a/drivers/power/reset/linkstation-poweroff.c
|
|
|
+++ b/drivers/power/reset/linkstation-poweroff.c
|
|
|
@@ -29,11 +29,21 @@
|
|
@@ -42,7 +40,7 @@ index f1e843df0e16..8691cf98600d 100644
|
|
|
|
|
|
saved_page = phy_select_page(phydev, MII_MARVELL_LED_PAGE);
|
|
|
if (saved_page < 0)
|
|
|
-@@ -66,11 +76,16 @@ static void mvphy_reg_intn(u16 data)
|
|
|
+@@ -66,11 +76,16 @@ err:
|
|
|
dev_err(&phydev->mdio.dev, "Write register failed, %d\n", rc);
|
|
|
}
|
|
|
|
|
@@ -60,7 +58,7 @@ index f1e843df0e16..8691cf98600d 100644
|
|
|
|
|
|
return NOTIFY_DONE;
|
|
|
}
|
|
|
-@@ -82,14 +97,18 @@ static struct notifier_block linkstation_reboot_nb = {
|
|
|
+@@ -82,14 +97,18 @@ static struct notifier_block linkstation
|
|
|
static void linkstation_poweroff(void)
|
|
|
{
|
|
|
unregister_reboot_notifier(&linkstation_reboot_nb);
|
|
@@ -82,7 +80,7 @@ index f1e843df0e16..8691cf98600d 100644
|
|
|
{ },
|
|
|
};
|
|
|
|
|
|
-@@ -97,13 +116,17 @@ static int __init linkstation_poweroff_init(void)
|
|
|
+@@ -97,13 +116,17 @@ static int __init linkstation_poweroff_i
|
|
|
{
|
|
|
struct mii_bus *bus;
|
|
|
struct device_node *dn;
|
|
@@ -101,6 +99,3 @@ index f1e843df0e16..8691cf98600d 100644
|
|
|
if (!dn)
|
|
|
return -ENODEV;
|
|
|
|
|
|
---
|
|
|
-2.25.1
|
|
|
-
|