[PATCH] scsi_merge.c 2.5.12

Fix oopses on ISA scsi adapters.

[ This is a transfer from Dave's tree ]

diff --git a/drivers/scsi/scsi_merge.c b/drivers/scsi/scsi_merge.c
index 4890d73324536494111c0883fc4e62f33cbd79bb..d462dd1c0db51e3ee1b65fff925b08ef331f47a3 100644 (file)
--- a/drivers/scsi/scsi_merge.c
+++ b/drivers/scsi/scsi_merge.c
@@ -136,7 +136,7 @@ void scsi_initialize_merge_fn(Scsi_Device * SDpnt)
                         * hardware have no practical limit.
                         */
                        bounce_limit = BLK_BOUNCE_ANY;
-               else
+               else if (SHpnt->pci_dev)
                        bounce_limit = SHpnt->pci_dev->dma_mask;
        } else if (SHpnt->unchecked_isa_dma)
                bounce_limit = BLK_BOUNCE_ISA;