block: replace end_request() with [__]blk_end_request_cur()

[net-next-2.6.git] / drivers / sbus / char / jsflash.c

diff --git a/drivers/sbus/char/jsflash.c b/drivers/sbus/char/jsflash.c
index a85ad05e85482a96d774358123b88e3401a50d0b..09617884a50b1adf8539983042c8807534e9415a 100644 (file)
--- a/drivers/sbus/char/jsflash.c
+++ b/drivers/sbus/char/jsflash.c
@@ -192,25 +192,25 @@ static void jsfd_do_request(struct request_queue *q)
                size_t len = req->current_nr_sectors << 9;
 
                if ((offset + len) > jdp->dsize) {
-                               end_request(req, 0);
+                       __blk_end_request_cur(req, -EIO);
                        continue;
                }
 
                if (rq_data_dir(req) != READ) {
                        printk(KERN_ERR "jsfd: write\n");
-                       end_request(req, 0);
+                       __blk_end_request_cur(req, -EIO);
                        continue;
                }
 
                if ((jdp->dbase & 0xff000000) != 0x20000000) {
                        printk(KERN_ERR "jsfd: bad base %x\n", (int)jdp->dbase);
-                       end_request(req, 0);
+                       __blk_end_request_cur(req, -EIO);
                        continue;
                }
 
                jsfd_read(req->buffer, jdp->dbase + offset, len);
 
-               end_request(req, 1);
+               __blk_end_request_cur(req, 0);
        }
 }