diff options
Diffstat (limited to 'drivers/block/paride/pcd.c')
-rw-r--r-- | drivers/block/paride/pcd.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/block/paride/pcd.c b/drivers/block/paride/pcd.c index e91d4b4b014f..9fd57c2aa463 100644 --- a/drivers/block/paride/pcd.c +++ b/drivers/block/paride/pcd.c | |||
@@ -735,16 +735,16 @@ static void do_pcd_request(struct request_queue * q) | |||
735 | ps_set_intr(do_pcd_read, NULL, 0, nice); | 735 | ps_set_intr(do_pcd_read, NULL, 0, nice); |
736 | return; | 736 | return; |
737 | } else | 737 | } else |
738 | end_request(pcd_req, 0); | 738 | __blk_end_request_cur(pcd_req, -EIO); |
739 | } | 739 | } |
740 | } | 740 | } |
741 | 741 | ||
742 | static inline void next_request(int success) | 742 | static inline void next_request(int err) |
743 | { | 743 | { |
744 | unsigned long saved_flags; | 744 | unsigned long saved_flags; |
745 | 745 | ||
746 | spin_lock_irqsave(&pcd_lock, saved_flags); | 746 | spin_lock_irqsave(&pcd_lock, saved_flags); |
747 | end_request(pcd_req, success); | 747 | __blk_end_request_cur(pcd_req, err); |
748 | pcd_busy = 0; | 748 | pcd_busy = 0; |
749 | do_pcd_request(pcd_queue); | 749 | do_pcd_request(pcd_queue); |
750 | spin_unlock_irqrestore(&pcd_lock, saved_flags); | 750 | spin_unlock_irqrestore(&pcd_lock, saved_flags); |
@@ -781,7 +781,7 @@ static void pcd_start(void) | |||
781 | 781 | ||
782 | if (pcd_command(pcd_current, rd_cmd, 2048, "read block")) { | 782 | if (pcd_command(pcd_current, rd_cmd, 2048, "read block")) { |
783 | pcd_bufblk = -1; | 783 | pcd_bufblk = -1; |
784 | next_request(0); | 784 | next_request(-EIO); |
785 | return; | 785 | return; |
786 | } | 786 | } |
787 | 787 | ||
@@ -796,7 +796,7 @@ static void do_pcd_read(void) | |||
796 | pcd_retries = 0; | 796 | pcd_retries = 0; |
797 | pcd_transfer(); | 797 | pcd_transfer(); |
798 | if (!pcd_count) { | 798 | if (!pcd_count) { |
799 | next_request(1); | 799 | next_request(0); |
800 | return; | 800 | return; |
801 | } | 801 | } |
802 | 802 | ||
@@ -815,7 +815,7 @@ static void do_pcd_read_drq(void) | |||
815 | return; | 815 | return; |
816 | } | 816 | } |
817 | pcd_bufblk = -1; | 817 | pcd_bufblk = -1; |
818 | next_request(0); | 818 | next_request(-EIO); |
819 | return; | 819 | return; |
820 | } | 820 | } |
821 | 821 | ||