--- linux-2.4.22/drivers/scsi/scsi_error.c	Thu Nov 28 23:53:14 2002
+++ /home/peter/scsi_error.c	Tue Aug 26 14:35:14 2003
@@ -1262,7 +1262,12 @@
 		    || (host->host_blocked)
 		    || (host->host_self_blocked)
 		    || (SDpnt->device_blocked)) {
-			break;
+			if (atomic_read(&SDpnt->device_busy) == 0) {
+				SDpnt->starved = 1;
+				host->some_device_starved = 1;
+				
+			}
+			continue;
 		}
 		q = &SDpnt->request_queue;
 		q->request_fn(q);