git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'for-5.1/block-20190302' of git://git.kernel.dk/linux-block
[sfrench/cifs-2.6.git]
/
drivers
/
block
/
floppy.c
diff --git
a/drivers/block/floppy.c
b/drivers/block/floppy.c
index 04d47683eddd63cbecdff1a19ea2902f1ab2c751..95f608d1a098a2c0d0d312e1bd6be82517bfabaf 100644
(file)
--- a/
drivers/block/floppy.c
+++ b/
drivers/block/floppy.c
@@
-4072,7
+4072,7
@@
static unsigned int floppy_check_events(struct gendisk *disk,
if (time_after(jiffies, UDRS->last_checked + UDP->checkfreq)) {
if (lock_fdc(drive))
- return
-EINTR
;
+ return
0
;
poll_drive(false, 0);
process_fd_request();
}