Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 820b688b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull libata fixes from Tejun Heo:
 "Three libata fixes for v3.18.  Nothing too interesting.  PCI ID ID and
  quirk additions to ahci and an error handling path fix in sata_fsl"

* 'for-3.18-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata:
  ahci: disable MSI on SAMSUNG 0xa800 SSD
  sata_fsl: fix error handling of irq_of_parse_and_map
  AHCI: Add DeviceIDs for Sunrise Point-LP SATA controller
parents 19b02257 2b21ef0a

drivers/ata/ahci.c

+4 −0
Original line number Diff line number Diff line
@@ -321,6 +321,9 @@ static const struct pci_device_id ahci_pci_tbl[] = { 
	{ PCI_VDEVICE(INTEL, 0x8c87), board_ahci }, /* 9 Series RAID */

	{ PCI_VDEVICE(INTEL, 0x8c8e), board_ahci }, /* 9 Series RAID */

	{ PCI_VDEVICE(INTEL, 0x8c8f), board_ahci }, /* 9 Series RAID */

	{ PCI_VDEVICE(INTEL, 0x9d03), board_ahci }, /* Sunrise Point-LP AHCI */

	{ PCI_VDEVICE(INTEL, 0x9d05), board_ahci }, /* Sunrise Point-LP RAID */

	{ PCI_VDEVICE(INTEL, 0x9d07), board_ahci }, /* Sunrise Point-LP RAID */

	{ PCI_VDEVICE(INTEL, 0xa103), board_ahci }, /* Sunrise Point-H AHCI */

	{ PCI_VDEVICE(INTEL, 0xa103), board_ahci }, /* Sunrise Point-H RAID */

	{ PCI_VDEVICE(INTEL, 0xa105), board_ahci }, /* Sunrise Point-H RAID */
@@ -492,6 +495,7 @@ static const struct pci_device_id ahci_pci_tbl[] = { 
	 * enabled.  https://bugzilla.kernel.org/show_bug.cgi?id=60731

	 */

	{ PCI_VDEVICE(SAMSUNG, 0x1600), board_ahci_nomsi },

	{ PCI_VDEVICE(SAMSUNG, 0xa800), board_ahci_nomsi },



	/* Enmotus */

	{ PCI_DEVICE(0x1c44, 0x8000), board_ahci },

drivers/ata/sata_fsl.c

+1 −1
Original line number Diff line number Diff line
@@ -1488,7 +1488,7 @@ static int sata_fsl_probe(struct platform_device *ofdev) 
	host_priv->csr_base = csr_base;



	irq = irq_of_parse_and_map(ofdev->dev.of_node, 0);

	if (irq < 0) {

	if (!irq) {

		dev_err(&ofdev->dev, "invalid irq from platform\n");

		goto error_exit_with_cleanup;

	}