Merge branch 'uprobes-v7' of git://git.linaro.org/people/dave.long/linux into devel-stable

This patch series adds basic uprobes support to ARM. It is based on
patches developed earlier by Rabin Vincent. That approach of adding
hooks into the kprobes instruction parsing code was not well received.
This approach separates the ARM instruction parsing code in kprobes out
into a separate set of functions which can be used by both kprobes and
uprobes. Both kprobes and uprobes then provide their own semantic action
tables to process the results of the parsing.

1 files changed, 6 insertions, 8 deletions

diff --git a/drivers/phy/phy-core.c b/drivers/phy/phy-core.c
index 5f5b0f4be5be..6c738376daff 100644
--- a/drivers/phy/phy-core.c
+++ b/drivers/phy/phy-core.c
@@ -176,6 +176,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 */
         }
         ++phy->init_count;
 
@@ -232,6 +234,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 */
         }
         ++phy->power_count;
         mutex_unlock(&phy->mutex);
@@ -404,17 +408,11 @@ struct phy *phy_get(struct device *dev, const char *string)
                 index = of_property_match_string(dev->of_node, "phy-names",
                         string);
                 phy = of_phy_get(dev, index);
-                if (IS_ERR(phy)) {
-                        dev_err(dev, "unable to find phy\n");
-                        return phy;
-                }
         } else {
                 phy = phy_lookup(dev, string);
-                if (IS_ERR(phy)) {
-                        dev_err(dev, "unable to find phy\n");
-                        return phy;
-                }
         }
+        if (IS_ERR(phy))
+                return phy;
 
         if (!try_module_get(phy->ops->owner))
                 return ERR_PTR(-EPROBE_DEFER);