Merge 3.15-rc3 into staging-next

1 files changed, 16 insertions, 0 deletions

diff --git a/include/linux/phy/phy.h b/include/linux/phy/phy.h
index e2f5ca96cddc..2760744cb2a7 100644
--- a/include/linux/phy/phy.h
+++ b/include/linux/phy/phy.h
@@ -174,21 +174,29 @@ void devm_of_phy_provider_unregister(struct device *dev,
 #else
 static inline int phy_pm_runtime_get(struct phy *phy)
 {
+        if (!phy)
+                return 0;
         return -ENOSYS;
 }
 
 static inline int phy_pm_runtime_get_sync(struct phy *phy)
 {
+        if (!phy)
+                return 0;
         return -ENOSYS;
 }
 
 static inline int phy_pm_runtime_put(struct phy *phy)
 {
+        if (!phy)
+                return 0;
         return -ENOSYS;
 }
 
 static inline int phy_pm_runtime_put_sync(struct phy *phy)
 {
+        if (!phy)
+                return 0;
         return -ENOSYS;
 }
 
@@ -204,21 +212,29 @@ static inline void phy_pm_runtime_forbid(struct phy *phy)
 
 static inline int phy_init(struct phy *phy)
 {
+        if (!phy)
+                return 0;
         return -ENOSYS;
 }
 
 static inline int phy_exit(struct phy *phy)
 {
+        if (!phy)
+                return 0;
         return -ENOSYS;
 }
 
 static inline int phy_power_on(struct phy *phy)
 {
+        if (!phy)
+                return 0;
         return -ENOSYS;
 }
 
 static inline int phy_power_off(struct phy *phy)
 {
+        if (!phy)
+                return 0;
         return -ENOSYS;
 }