patch-2.1.34 linux/drivers/scsi/atari_scsi.c

• Lines: 14
• Date: Fri Apr 11 10:47:38 1997
• Orig file: v2.1.33/linux/drivers/scsi/atari_scsi.c
• Orig date: Fri Dec 20 01:20:02 1996

diff -u --recursive --new-file v2.1.33/linux/drivers/scsi/atari_scsi.c linux/drivers/scsi/atari_scsi.c
@@ -549,11 +549,11 @@
 	save_flags(oldflags);
 	cli();
 
-	while( intr_count == 0 && falcon_got_lock && stdma_others_waiting() )
+	while( !in_interrupt() && falcon_got_lock && stdma_others_waiting() )
 		sleep_on( &falcon_fairness_wait );
 
 	while (!falcon_got_lock) {
-		if (intr_count > 0)
+		if (in_interrupt())
 			panic( "Falcon SCSI hasn't ST-DMA lock in interrupt" );
 		if (!falcon_trying_lock) {
 			falcon_trying_lock = 1;