From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 20 Feb 2014 20:04:15 +0000 (-0800)
Subject: Merge branch 'for-3.14-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj... 
X-Git-Tag: v3.14-rc4~21
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=54dfffde22ee5ac5a6f912eb451b52683ef3ea7f;p=~emulex%2Finfiniband.git

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

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()
---

54dfffde22ee5ac5a6f912eb451b52683ef3ea7f
diff --cc drivers/ata/sata_mv.c
index 52b8181ddaf,9c1a11de304..05c8a44adf8
--- a/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]);