Thread (8 messages) flat view 8 messages, 3 authors, 2014-01-07
STALE4631d

[PATCH 2/2] phy-core: Don't propagate -ENOSUPP from phy_pm_runtime_get_sync to caller

From: Sergei Shtylyov <hidden>
Date: 2014-01-06 17:37:09

Hello.

On 06-01-2014 3:06, Hans de Goede wrote:
The phy-core allows phy_init and phy_power_on to be called multiple times,
but before this patch -ENOSUPP from phy_pm_runtime_get_sync would be
propagated to the caller for the 2nd and later calls.
Signed-off-by: Hans de Goede <redacted>
---
  drivers/phy/phy-core.c | 6 ++++--
  1 file changed, 4 insertions(+), 2 deletions(-)
quoted hunk ↗ jump to hunk
diff --git a/drivers/phy/phy-core.c b/drivers/phy/phy-core.c
index d7b992e..8ee6157 100644
--- a/drivers/phy/phy-core.c
+++ b/drivers/phy/phy-core.c
@@ -161,7 +161,8 @@ int phy_init(struct phy *phy)
  			dev_err(&phy->dev, "phy init failed --> %d\n", ret);
  			goto out;
  		}
-	}
+	} else
+		ret = 0; /* Override possible ret == -ENOTSUPP */
    *else* arm should have {} when the *if* arm has it.
quoted hunk ↗ jump to hunk
@@ -209,7 +210,8 @@ int phy_power_on(struct phy *phy)
  			dev_err(&phy->dev, "phy poweron failed --> %d\n", ret);
  			goto out;
  		}
-	}
+	} else
+		ret = 0; /* Override possible ret == -ENOTSUPP */
    Same here.

WBR, Sergei
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help