]> err.no Git - linux-2.6/commitdiff
[PATCH] scsi: megaraid_{mm,mbox}: 64-bit DMA capability fix
authorAndrey Mirkin <amirkin@sw.ru>
Mon, 16 Oct 2006 08:08:43 +0000 (12:08 +0400)
committerLinus Torvalds <torvalds@g5.osdl.org>
Mon, 16 Oct 2006 15:30:04 +0000 (08:30 -0700)
It is known that 2 LSI Logic MegaRAID SATA RAID Controllers (150-4 and
150-6) don't support 64-bit DMA.  Unfortunately currently this check is
wrong and driver sets 64-bit DMA mode for these devices.

Signed-off-by: Andrey Mirkin <amirkin@sw.ru>
Acked-by: Vasily Averin <vvs@sw.ru>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
drivers/scsi/megaraid/megaraid_mbox.c

index c0edb662d863e232a9f45d7fcb6b431f00a985b3..7bac86dda88f9fdc053105ae149e9c9753125421 100644 (file)
@@ -884,7 +884,7 @@ megaraid_init_mbox(adapter_t *adapter)
 
        if (((magic64 == HBA_SIGNATURE_64_BIT) &&
                ((adapter->pdev->subsystem_device !=
-               PCI_SUBSYS_ID_MEGARAID_SATA_150_6) ||
+               PCI_SUBSYS_ID_MEGARAID_SATA_150_6) &&
                (adapter->pdev->subsystem_device !=
                PCI_SUBSYS_ID_MEGARAID_SATA_150_4))) ||
                (adapter->pdev->vendor == PCI_VENDOR_ID_LSI_LOGIC &&