[PATCH] scsi_merge.c 2.5.12

Fix oopses on ISA scsi adapters. [ This is a transfer from Dave's tree ]

[PATCH] scsi_merge.c 2.5.12
Fix oopses on ISA scsi adapters. [ This is a transfer from Dave's tree ]
194e5de9 · Douglas Gilbert · Linus Torvalds · 1d03afe4 · 194e5de9
Commit 194e5de9 authored May 02, 2002 by Douglas Gilbert Committed by Linus Torvalds May 02, 2002
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

drivers/scsi/scsi_merge.c drivers/scsi/scsi_merge.c +1 -1

No files found.
--- 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;