diff options
Diffstat (limited to 'drivers/sbus/char/jsflash.c')
-rw-r--r-- | drivers/sbus/char/jsflash.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/sbus/char/jsflash.c b/drivers/sbus/char/jsflash.c index a85ad05e854..09617884a50 100644 --- 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) | |||
192 | size_t len = req->current_nr_sectors << 9; | 192 | size_t len = req->current_nr_sectors << 9; |
193 | 193 | ||
194 | if ((offset + len) > jdp->dsize) { | 194 | if ((offset + len) > jdp->dsize) { |
195 | end_request(req, 0); | 195 | __blk_end_request_cur(req, -EIO); |
196 | continue; | 196 | continue; |
197 | } | 197 | } |
198 | 198 | ||
199 | if (rq_data_dir(req) != READ) { | 199 | if (rq_data_dir(req) != READ) { |
200 | printk(KERN_ERR "jsfd: write\n"); | 200 | printk(KERN_ERR "jsfd: write\n"); |
201 | end_request(req, 0); | 201 | __blk_end_request_cur(req, -EIO); |
202 | continue; | 202 | continue; |
203 | } | 203 | } |
204 | 204 | ||
205 | if ((jdp->dbase & 0xff000000) != 0x20000000) { | 205 | if ((jdp->dbase & 0xff000000) != 0x20000000) { |
206 | printk(KERN_ERR "jsfd: bad base %x\n", (int)jdp->dbase); | 206 | printk(KERN_ERR "jsfd: bad base %x\n", (int)jdp->dbase); |
207 | end_request(req, 0); | 207 | __blk_end_request_cur(req, -EIO); |
208 | continue; | 208 | continue; |
209 | } | 209 | } |
210 | 210 | ||
211 | jsfd_read(req->buffer, jdp->dbase + offset, len); | 211 | jsfd_read(req->buffer, jdp->dbase + offset, len); |
212 | 212 | ||
213 | end_request(req, 1); | 213 | __blk_end_request_cur(req, 0); |
214 | } | 214 | } |
215 | } | 215 | } |
216 | 216 | ||