Merge branch 'for-3.16-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata into for-3.17

The scheduled ahci platform patches depend on change in
for-3.16-fixes.  Pull it into for-3.17.

Signed-off-by: Tejun Heo <tj@kernel.org>

1 files changed, 6 insertions, 1 deletions

diff --git a/drivers/ata/libahci_platform.c b/drivers/ata/libahci_platform.c
index a958a2b8fd93..28840a2f470f 100644
--- a/drivers/ata/libahci_platform.c
+++ b/drivers/ata/libahci_platform.c
@@ -250,8 +250,13 @@ struct ahci_host_priv *ahci_platform_get_resources(struct platform_device *pdev)
         if (IS_ERR(hpriv->phy)) {
                 rc = PTR_ERR(hpriv->phy);
                 switch (rc) {
-                case -ENODEV:
                 case -ENOSYS:
+                        /* No PHY support. Check if PHY is required. */
+                        if (of_find_property(dev->of_node, "phys", NULL)) {
+                                dev_err(dev, "couldn't get sata-phy: ENOSYS\n");
+                                goto err_out;
+                        }
+                case -ENODEV:
                         /* continue normally */
                         hpriv->phy = NULL;
                         break;