diff options
| author | Steven Rostedt (VMware) <rostedt@goodmis.org> | 2019-03-26 15:31:57 -0400 |
|---|---|---|
| committer | Steven Rostedt (VMware) <rostedt@goodmis.org> | 2019-03-27 08:58:54 -0400 |
| commit | e5e9c17efe77dbbc9b041a517705e0b6c1866110 (patch) | |
| tree | d191db7bfce550a5368d22d392b0de260cd1f73c /drivers/block | |
| parent | fe8ac4c919832f77fa96e90caef8559088ec8f40 (diff) | |
| parent | a2cddfe2ce6e9108341820fff8af46713685b2cb (diff) | |
Merge tag 'v4.19.31' into v4.19-rt
This is the 4.19.31 stable release
Conflicts:
mm/swap.c
Diffstat (limited to 'drivers/block')
| -rw-r--r-- | drivers/block/floppy.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c index fdabd0b74492..a8de56f1936d 100644 --- a/drivers/block/floppy.c +++ b/drivers/block/floppy.c @@ -4084,7 +4084,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(); } |