aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/block/amiflop.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/block/amiflop.c')
-rw-r--r--drivers/block/amiflop.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/block/amiflop.c b/drivers/block/amiflop.c
index 8df436ff7068..b99a2a606d02 100644
--- a/drivers/block/amiflop.c
+++ b/drivers/block/amiflop.c
@@ -1359,7 +1359,7 @@ static void redo_fd_request(void)
1359#endif 1359#endif
1360 block = CURRENT->sector + cnt; 1360 block = CURRENT->sector + cnt;
1361 if ((int)block > floppy->blocks) { 1361 if ((int)block > floppy->blocks) {
1362 end_request(CURRENT, 0); 1362 __blk_end_request_cur(CURRENT, -EIO);
1363 goto repeat; 1363 goto repeat;
1364 } 1364 }
1365 1365
@@ -1373,11 +1373,11 @@ static void redo_fd_request(void)
1373 1373
1374 if ((rq_data_dir(CURRENT) != READ) && (rq_data_dir(CURRENT) != WRITE)) { 1374 if ((rq_data_dir(CURRENT) != READ) && (rq_data_dir(CURRENT) != WRITE)) {
1375 printk(KERN_WARNING "do_fd_request: unknown command\n"); 1375 printk(KERN_WARNING "do_fd_request: unknown command\n");
1376 end_request(CURRENT, 0); 1376 __blk_end_request_cur(CURRENT, -EIO);
1377 goto repeat; 1377 goto repeat;
1378 } 1378 }
1379 if (get_track(drive, track) == -1) { 1379 if (get_track(drive, track) == -1) {
1380 end_request(CURRENT, 0); 1380 __blk_end_request_cur(CURRENT, -EIO);
1381 goto repeat; 1381 goto repeat;
1382 } 1382 }
1383 1383
@@ -1391,7 +1391,7 @@ static void redo_fd_request(void)
1391 1391
1392 /* keep the drive spinning while writes are scheduled */ 1392 /* keep the drive spinning while writes are scheduled */
1393 if (!fd_motor_on(drive)) { 1393 if (!fd_motor_on(drive)) {
1394 end_request(CURRENT, 0); 1394 __blk_end_request_cur(CURRENT, -EIO);
1395 goto repeat; 1395 goto repeat;
1396 } 1396 }
1397 /* 1397 /*
@@ -1410,7 +1410,7 @@ static void redo_fd_request(void)
1410 CURRENT->nr_sectors -= CURRENT->current_nr_sectors; 1410 CURRENT->nr_sectors -= CURRENT->current_nr_sectors;
1411 CURRENT->sector += CURRENT->current_nr_sectors; 1411 CURRENT->sector += CURRENT->current_nr_sectors;
1412 1412
1413 end_request(CURRENT, 1); 1413 __blk_end_request_cur(CURRENT, 0);
1414 goto repeat; 1414 goto repeat;
1415} 1415}
1416 1416