floppy: check_events callback should not return a negative number

Yufen Yu · axboe · commit 96d7cb932e82 · 2019-02-12T09:13:18.000-07:00
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 a0c80ef, 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: a0c80ef ("floppy: fix lock_fdc() signal handling") Signed-off-by: Yufen Yu <yuyufen@huawei.com> Signed-off-by: Jens Axboe <axboe@kernel.dk>
diff --git 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();
 	}

Original file line number	Diff line number	Diff line change
`@@ -4075,7 +4075,7 @@ static unsigned int floppy_check_events(struct gendisk *disk,`
`4075`	`4075`
`4076`	`4076`	`if (time_after(jiffies, UDRS->last_checked + UDP->checkfreq)) {`
`4077`	`4077`	`if (lock_fdc(drive))`
`4078`		`- return -EINTR;`
	`4078`	`+ return 0;`
`4079`	`4079`	`poll_drive(false, 0);`
`4080`	`4080`	`process_fd_request();`
`4081`	`4081`	`}`