[PATCH] scsi_merge.c 2.5.12

Fix oopses on ISA scsi adapters.

[ This is a transfer from Dave's tree ]

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;