patch-2.0.18 linux/drivers/scsi/ncr53c8xx.c

• Lines: 33
• Date: Wed Sep 4 10:43:08 1996
• Orig file: v2.0.17/linux/drivers/scsi/ncr53c8xx.c
• Orig date: Sun Sep 1 09:15:33 1996

diff -u --recursive --new-file v2.0.17/linux/drivers/scsi/ncr53c8xx.c linux/drivers/scsi/ncr53c8xx.c
@@ -4325,6 +4325,7 @@
 	lcb_p lp;
 	int target, lun;
 	int i;
+	u_char scntl3;
 
 	printf("%s: releasing host resources\n", ncr_name(np));
 
@@ -4371,12 +4372,15 @@
 
 	/*
 	**	Reset NCR chip
+	**	Preserve scntl3 for automatic clock detection.
 	*/
 
 	printf("%s: resetting chip\n", ncr_name(np));
+	scntl3 = INB (nc_scntl3);
 	OUTB (nc_istat,  SRST);
 	DELAY (1000);
 	OUTB (nc_istat,  0   );
+	OUTB (nc_scntl3, scntl3);
 
 	/*
 	**	Release Memory mapped IO region and IO mapped region
@@ -7353,7 +7357,7 @@
 	 */
 
 	if ((scntl3 & 7) < 3) {
-		printf ("%s: assuming 40MHz clock", ncr_name(np));
+		printf ("%s: assuming 40MHz clock\n", ncr_name(np));
 		scntl3 = 3; /* assume 40MHz if no value supplied by BIOS */
 	}