Merge branch 'for-3.14-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj...

Pull libata fixes from Tejun Heo:
 "Various device specific fixes.  Nothing too interesting"

* 'for-3.14-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata:
  ahci: disable NCQ on Samsung pci-e SSDs on macbooks
  ata: sata_mv: Cleanup only the initialized ports
  sata_sil: apply MOD15WRITE quirk to TOSHIBA MK2561GSYN
  ata: enable quirk from jmicron JMB350 for JMB394
  ATA: SATA_MV: Add missing Kconfig select statememnt
  ata: pata_imx: Check the return value from clk_prepare_enable()

diff --cc drivers/ata/sata_mv.c
index 52b8181ddafd98cbfb550b3f082062280feec6d2,9c1a11de30441f0cc26b32a05dd91adecef68a18..05c8a44adf8edea590ec983a7f843c1f5b6b1b55
--- 1/drivers/ata/sata_mv.c
--- 2/drivers/ata/sata_mv.c
+++ b/drivers/ata/sata_mv.c
@@@ -4131,9 -4129,11 +4130,11 @@@ static int mv_platform_probe(struct pla
                if (IS_ERR(hpriv->port_phys[port])) {
                        rc = PTR_ERR(hpriv->port_phys[port]);
                        hpriv->port_phys[port] = NULL;
 -                      if ((rc != -EPROBE_DEFER) && (rc != -ENODEV))
 -                              dev_warn(&pdev->dev, "error getting phy");
 +                      if (rc != -EPROBE_DEFER)
-                               dev_warn(&pdev->dev, "error getting phy %d",
-                                       rc);
++                              dev_warn(&pdev->dev, "error getting phy %d", rc);
+ 
+                       /* Cleanup only the initialized ports */
+                       hpriv->n_ports = port;
                        goto err;
                } else
                        phy_power_on(hpriv->port_phys[port]);