diff options
| author | Yufen Yu <yuyufen@huawei.com> | 2019-01-29 09:34:04 +0100 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2019-02-12 17:13:18 +0100 |
| commit | 96d7cb932e826219ec41ac02e5af037ffae6098c (patch) | |
| tree | 5064e8614989c7d577066c3d3a691b86f95fe864 /drivers/block/floppy.c | |
| parent | blk-mq: insert rq with DONTPREP to hctx dispatch list when requeue (diff) | |
| download | linux-96d7cb932e826219ec41ac02e5af037ffae6098c.tar.xz linux-96d7cb932e826219ec41ac02e5af037ffae6098c.zip | |
floppy: check_events callback should not return a negative number
floppy_check_events() is supposed to return bit flags to say which
events occured. We should return zero to say that no event flags are
set. Only BIT(0) and BIT(1) are used in the caller. And .check_events
interface also expect to return an unsigned int value.
However, after commit a0c80efe5956, it may return -EINTR (-4u).
Here, both BIT(0) and BIT(1) are cleared. So this patch shouldn't
affect runtime, but it obviously is still worth fixing.
Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
Fixes: a0c80efe5956 ("floppy: fix lock_fdc() signal handling")
Signed-off-by: Yufen Yu <yuyufen@huawei.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'drivers/block/floppy.c')
| -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 6f2856c6d0f2..55481b40df9a 100644 --- a/drivers/block/floppy.c +++ b/drivers/block/floppy.c @@ -4075,7 +4075,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(); } |