diff options
Diffstat (limited to 'drivers/block/paride/pd.c')
-rw-r--r-- | drivers/block/paride/pd.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/block/paride/pd.c b/drivers/block/paride/pd.c index d2ca3f552061..bf5955b3d873 100644 --- a/drivers/block/paride/pd.c +++ b/drivers/block/paride/pd.c | |||
@@ -412,11 +412,9 @@ static void run_fsm(void) | |||
412 | spin_lock_irqsave(&pd_lock, saved_flags); | 412 | spin_lock_irqsave(&pd_lock, saved_flags); |
413 | if (!__blk_end_request_cur(pd_req, | 413 | if (!__blk_end_request_cur(pd_req, |
414 | res == Ok ? 0 : -EIO)) { | 414 | res == Ok ? 0 : -EIO)) { |
415 | pd_req = elv_next_request(pd_queue); | 415 | pd_req = blk_fetch_request(pd_queue); |
416 | if (!pd_req) | 416 | if (!pd_req) |
417 | stop = 1; | 417 | stop = 1; |
418 | else | ||
419 | blkdev_dequeue_request(pd_req); | ||
420 | } | 418 | } |
421 | spin_unlock_irqrestore(&pd_lock, saved_flags); | 419 | spin_unlock_irqrestore(&pd_lock, saved_flags); |
422 | if (stop) | 420 | if (stop) |
@@ -706,10 +704,9 @@ static void do_pd_request(struct request_queue * q) | |||
706 | { | 704 | { |
707 | if (pd_req) | 705 | if (pd_req) |
708 | return; | 706 | return; |
709 | pd_req = elv_next_request(q); | 707 | pd_req = blk_fetch_request(q); |
710 | if (!pd_req) | 708 | if (!pd_req) |
711 | return; | 709 | return; |
712 | blkdev_dequeue_request(pd_req); | ||
713 | 710 | ||
714 | schedule_fsm(); | 711 | schedule_fsm(); |
715 | } | 712 | } |