projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e26738e
)
floppy: switch from req->errors to req->error_count
author
Christoph Hellwig
<
[email protected]
>
Thu, 20 Apr 2017 14:03:12 +0000
(16:03 +0200)
committer
Jens Axboe
<
[email protected]
>
Thu, 20 Apr 2017 18:16:10 +0000
(12:16 -0600)
Signed-off-by: Christoph Hellwig <
[email protected]
>
Signed-off-by: Jens Axboe <
[email protected]
>
drivers/block/floppy.c
patch
|
blob
|
history
diff --git
a/drivers/block/floppy.c
b/drivers/block/floppy.c
index ce102ec47ef28a00ec9bcb00f9edaf1e39d0eacd..60d4c765317833ec75ef6637104325b96084cc11 100644
(file)
--- 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->error
s
);
+ errors = &(current_req->error
_count
);
tmp = make_raw_rw_request();
if (tmp < 2) {
request_done(tmp);