diff options
| author | Christoph Hellwig <hch@lst.de> | 2017-04-20 16:03:12 +0200 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2017-04-20 12:16:10 -0600 |
| commit | 4590879596bf8fbec68929e8f58dcf453d68cc0d (patch) | |
| tree | 2df8855da30c80aac9edbc372dcb09c290d99cf8 /drivers/block/floppy.c | |
| parent | e26738e037f34aedfe05e412f442833f44f4a6e5 (diff) | |
| download | blackbird-obmc-linux-4590879596bf8fbec68929e8f58dcf453d68cc0d.tar.gz blackbird-obmc-linux-4590879596bf8fbec68929e8f58dcf453d68cc0d.zip | |
floppy: switch from req->errors to req->error_count
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'drivers/block/floppy.c')
| -rw-r--r-- | drivers/block/floppy.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c index ce102ec47ef2..60d4c7653178 100644 --- a/drivers/block/floppy.c +++ b/drivers/block/floppy.c @@ -2805,8 +2805,10 @@ static int set_next_request(void) fdc_queue = 0; if (q) { current_req = blk_fetch_request(q); - if (current_req) + if (current_req) { + current_req->error_count = 0; break; + } } } while (fdc_queue != old_pos); @@ -2866,7 +2868,7 @@ do_request: _floppy = floppy_type + DP->autodetect[DRS->probed_format]; } else probing = 0; - errors = &(current_req->errors); + errors = &(current_req->error_count); tmp = make_raw_rw_request(); if (tmp < 2) { request_done(tmp); |
