From: Badari Pulavarty <pbadari@us.ibm.com>




 25-akpm/drivers/scsi/isp/isp_pci.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff -puN drivers/scsi/isp/isp_pci.c~feral-bounce-fix-2 drivers/scsi/isp/isp_pci.c
--- 25/drivers/scsi/isp/isp_pci.c~feral-bounce-fix-2	Wed Jul 16 14:43:17 2003
+++ 25-akpm/drivers/scsi/isp/isp_pci.c	Wed Jul 16 14:43:17 2003
@@ -852,8 +852,8 @@ isplinux_pci_init(struct Scsi_Host *host
     isp->isp_param = &isp_pci->params;
 #if	LINUX_VERSION_CODE > KERNEL_VERSION(2,4,19)
     host->highmem_io = 0;
-    if (ISP_A64 && (IS_FC(isp) || IS_ULTRA2(isp) || IS_1240(isp))) {
-	if (pci_set_dma_mask(isp_pci->pci_dev, (u64) 0xffffffffffffffffULL)) {
+    if (IS_FC(isp) || IS_ULTRA2(isp) || IS_1240(isp)) {
+	if (!ISP_A64 || pci_set_dma_mask(isp_pci->pci_dev, (u64) 0xffffffffffffffffULL)) {
 	    if (pci_set_dma_mask(isp_pci->pci_dev, (u64)0xffffffff)) {
 		isp_prt(isp, ISP_LOGERR, "cannot set 32 bit dma mask");
 		goto bad;

_