From e13660ee3a0ec5b897ca10d92beeee19523542ee Mon Sep 17 00:00:00 2001 From: Mark Nelson Date: Sun, 22 Nov 2009 12:07:41 +1100 Subject: [PATCH] --- yaml --- r: 172870 b: refs/heads/master c: 7a02267e0f3938a6e91c0a0a82211e4d7007210e h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/ata/ahci.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 617d27dcc0af..61f35fb71e48 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 89d3b3603bfb648e0113d8682d4f84dd18a776bd +refs/heads/master: 7a02267e0f3938a6e91c0a0a82211e4d7007210e diff --git a/trunk/drivers/ata/ahci.c b/trunk/drivers/ata/ahci.c index 9519c777af83..b8bea100a160 100644 --- a/trunk/drivers/ata/ahci.c +++ b/trunk/drivers/ata/ahci.c @@ -3004,6 +3004,14 @@ static int ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) if (pdev->vendor == PCI_VENDOR_ID_MARVELL && !marvell_enable) return -ENODEV; + /* Promise's PDC42819 is a SAS/SATA controller that has an AHCI mode. + * At the moment, we can only use the AHCI mode. Let the users know + * that for SAS drives they're out of luck. + */ + if (pdev->vendor == PCI_VENDOR_ID_PROMISE) + dev_printk(KERN_INFO, &pdev->dev, "PDC42819 " + "can only drive SATA devices with this driver\n"); + /* acquire resources */ rc = pcim_enable_device(pdev); if (rc)