patch-2.2.16 linux/drivers/block/pdc4030.c

• Lines: 48
• Date: Wed Jun 7 14:26:42 2000
• Orig file: v2.2.15/linux/drivers/block/pdc4030.c
• Orig date: Tue Jan 4 10:12:14 2000

diff -urN v2.2.15/linux/drivers/block/pdc4030.c linux/drivers/block/pdc4030.c
@@ -239,8 +239,8 @@
 		if(stat & DRQ_STAT)
 		    goto read_again;
 		if(stat & BUSY_STAT) {
-		    ide_set_handler (drive, &promise_read_intr, WAIT_CMD);
-		    return ide_started;;
+		    ide_set_handler (drive, &promise_read_intr, WAIT_CMD, NULL);
+		    return ide_started;
 		}
 		printk("Ah! promise read intr: sectors left !DRQ !BUSY\n");
 		return ide_error(drive, "promise read intr", stat);
@@ -259,7 +259,7 @@
 
         if (IN_BYTE(IDE_NSECTOR_REG) != 0) {
             if (time_before(jiffies, hwgroup->poll_timeout)) {
-                ide_set_handler (drive, &promise_write_pollfunc, 1);
+                ide_set_handler (drive, &promise_write_pollfunc, 1, NULL);
                 return ide_started; /* continue polling... */
             }
             printk("%s: write timed-out!\n",drive->name);
@@ -294,7 +294,7 @@
         if (ide_multwrite(drive, rq->nr_sectors - 4))
 		return ide_stopped;
         hwgroup->poll_timeout = jiffies + WAIT_WORSTCASE;
-        ide_set_handler (drive, &promise_write_pollfunc, 1);
+        ide_set_handler (drive, &promise_write_pollfunc, 1, NULL);
         return ide_started;
     } else {
         if (ide_multwrite(drive, rq->nr_sectors))
@@ -304,8 +304,8 @@
             i -= rq->current_nr_sectors;
             ide_end_request(1, hwgroup);
         }
-	return ide_stopped;
     }
+    return ide_stopped;
 }
 
 /*
@@ -319,7 +319,7 @@
 	byte stat;
 
 	if (rq->cmd == READ) {
-	    ide_set_handler(drive, &promise_read_intr, WAIT_CMD);
+	    ide_set_handler(drive, &promise_read_intr, WAIT_CMD, NULL);
 	    OUT_BYTE(PROMISE_READ, IDE_COMMAND_REG);
 /* The card's behaviour is odd at this point. If the data is
    available, DRQ will be true, and no interrupt will be