Merge 3.15-rc3 into staging-next

1 files changed, 3 insertions, 0 deletions

diff --git a/drivers/phy/phy-core.c b/drivers/phy/phy-core.c
index 623b71c54b3e..c64a2f3b2d62 100644
--- a/drivers/phy/phy-core.c
+++ b/drivers/phy/phy-core.c
@@ -64,6 +64,9 @@ static struct phy *phy_lookup(struct device *device, const char *port)
         class_dev_iter_init(&iter, phy_class, NULL, NULL);
         while ((dev = class_dev_iter_next(&iter))) {
                 phy = to_phy(dev);
+
+                if (!phy->init_data)
+                        continue;
                 count = phy->init_data->num_consumers;
                 consumers = phy->init_data->consumers;
                 while (count--) {