tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Linus Torvalds 820b688b 19b02257

+5 -1
+4
drivers/ata/ahci.c
··· 321 321 { PCI_VDEVICE(INTEL, 0x8c87), board_ahci }, /* 9 Series RAID */ 322 322 { PCI_VDEVICE(INTEL, 0x8c8e), board_ahci }, /* 9 Series RAID */ 323 323 { PCI_VDEVICE(INTEL, 0x8c8f), board_ahci }, /* 9 Series RAID */ 324 + { PCI_VDEVICE(INTEL, 0x9d03), board_ahci }, /* Sunrise Point-LP AHCI */ 325 + { PCI_VDEVICE(INTEL, 0x9d05), board_ahci }, /* Sunrise Point-LP RAID */ 326 + { PCI_VDEVICE(INTEL, 0x9d07), board_ahci }, /* Sunrise Point-LP RAID */ 324 327 { PCI_VDEVICE(INTEL, 0xa103), board_ahci }, /* Sunrise Point-H AHCI */ 325 328 { PCI_VDEVICE(INTEL, 0xa103), board_ahci }, /* Sunrise Point-H RAID */ 326 329 { PCI_VDEVICE(INTEL, 0xa105), board_ahci }, /* Sunrise Point-H RAID */ ··· 495 492 * enabled. https://bugzilla.kernel.org/show_bug.cgi?id=60731 496 493 */ 497 494 { PCI_VDEVICE(SAMSUNG, 0x1600), board_ahci_nomsi }, 495 + { PCI_VDEVICE(SAMSUNG, 0xa800), board_ahci_nomsi }, 498 496 499 497 /* Enmotus */ 500 498 { PCI_DEVICE(0x1c44, 0x8000), board_ahci },
+1 -1
drivers/ata/sata_fsl.c
··· 1488 1488 host_priv->csr_base = csr_base; 1489 1489 1490 1490 irq = irq_of_parse_and_map(ofdev->dev.of_node, 0); 1491 - if (irq < 0) { 1491 + if (!irq) { 1492 1492 dev_err(&ofdev->dev, "invalid irq from platform\n"); 1493 1493 goto error_exit_with_cleanup; 1494 1494 }