Merge branch 'acpi-ec'

[linux-drm-fsl-dcu.git] / drivers / ata / sata_mv.c

diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c
index f9a0e34eb111188ad152400a4ec733561ec755e7..f8c33e3772b823e123f4b32c2c066608297e06c2 100644 (file)
--- a/drivers/ata/sata_mv.c
+++ b/drivers/ata/sata_mv.c
@@ -4185,8 +4185,7 @@ err:
                        clk_disable_unprepare(hpriv->port_clks[port]);
                        clk_put(hpriv->port_clks[port]);
                }
-               if (hpriv->port_phys[port])
-                       phy_power_off(hpriv->port_phys[port]);
+               phy_power_off(hpriv->port_phys[port]);
        }
 
        return rc;
@@ -4216,8 +4215,7 @@ static int mv_platform_remove(struct platform_device *pdev)
                        clk_disable_unprepare(hpriv->port_clks[port]);
                        clk_put(hpriv->port_clks[port]);
                }
-               if (hpriv->port_phys[port])
-                       phy_power_off(hpriv->port_phys[port]);
+               phy_power_off(hpriv->port_phys[port]);
        }
        return 0;
 }