]> err.no Git - linux-2.6/commitdiff
[PATCH] cciss: fix pci ssid for the E500 controller
authorMike Miller <mike.miller@hp.com>
Thu, 7 Dec 2006 04:35:03 +0000 (20:35 -0800)
committerLinus Torvalds <torvalds@woody.osdl.org>
Thu, 7 Dec 2006 16:39:29 +0000 (08:39 -0800)
Change the SSID on the E500 as a workaround for a firmware bug.  It looks like
the original patch was backed out between rc2 and rc4.

Signed-off-by: Mike Miller <mike.miller@hp.com>
Acked-by: Jens Axboe <jens.axboe@oracle.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
drivers/block/cciss.c

index 0f976aaaf0497e4526628c9d0ee47429cf36be49..4899ab27f781920d31a20bfe88f0724eae92cd41 100644 (file)
@@ -82,7 +82,7 @@ static const struct pci_device_id cciss_pci_device_id[] = {
        {PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSD,     0x103C, 0x3213},
        {PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSD,     0x103C, 0x3214},
        {PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSD,     0x103C, 0x3215},
-       {PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSC,     0x103C, 0x3233},
+       {PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSC,     0x103C, 0x3237},
        {PCI_VENDOR_ID_HP,     PCI_ANY_ID,      PCI_ANY_ID, PCI_ANY_ID,
                PCI_CLASS_STORAGE_RAID << 8, 0xffff << 8, 0},
        {0,}
@@ -114,7 +114,7 @@ static struct board_type products[] = {
        {0x3213103C, "Smart Array E200i", &SA5_access, 120},
        {0x3214103C, "Smart Array E200i", &SA5_access, 120},
        {0x3215103C, "Smart Array E200i", &SA5_access, 120},
-       {0x3233103C, "Smart Array E500", &SA5_access, 512},
+       {0x3237103C, "Smart Array E500", &SA5_access, 512},
        {0xFFFF103C, "Unknown Smart Array", &SA5_access, 120},
 };