[LV-k25-commit] CVS: kernel-2.5/drivers/scsi scsi_merge.c,1.4,1.5

[Kenn H. <ke...@us...>]

Update of /cvsroot/linux-vax/kernel-2.5/drivers/scsi
In directory sc8-pr-cvs1:/tmp/cvs-serv18184/drivers/scsi

Modified Files:
	scsi_merge.c 
Log Message:
Merge with 2.5.13


Index: scsi_merge.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/scsi/scsi_merge.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- scsi_merge.c	2 Dec 2002 00:05:46 -0000	1.4
+++ scsi_merge.c	16 Dec 2002 01:06:00 -0000	1.5
@@ -137,7 +137,7 @@
  			 * hardware have no practical limit.
 			 */
 			bounce_limit = BLK_BOUNCE_ANY;
-		else
+		else if (SHpnt->pci_dev)
 			bounce_limit = SHpnt->pci_dev->dma_mask;
 #endif
 	} else if (SHpnt->unchecked_isa_dma)