diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2023-01-20 11:04:28 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2023-01-20 11:04:28 +0100 |
| commit | c95d0b36b69ea90cadf74c741d5a6f51a815bcfa (patch) | |
| tree | dd12287c71191ef2f842d27a6ede31dbf944f241 /include/linux | |
| parent | a77fef4d29ed63c96c67692ceb6decef4f9cfbe4 (diff) | |
| parent | b88d33fcdab54b3b4018b8b1e7c81c16eac247f9 (diff) | |
| download | barebox-c95d0b36b69ea90cadf74c741d5a6f51a815bcfa.tar.gz | |
Merge branch 'for-next/misc'
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/iopoll.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/iopoll.h b/include/linux/iopoll.h index 8bf912e173..96b17dee48 100644 --- a/include/linux/iopoll.h +++ b/include/linux/iopoll.h @@ -32,13 +32,13 @@ #define read_poll_timeout(op, val, cond, timeout_us, args...) \ ({ \ uint64_t start; \ - if (!IN_PBL && timeout_us) \ + if (!IN_PBL && (timeout_us) != 0) \ start = get_time_ns(); \ for (;;) { \ (val) = op(args); \ if (cond) \ break; \ - if (!IN_PBL && timeout_us && \ + if (!IN_PBL && (timeout_us) != 0 && \ is_timeout(start, ((timeout_us) * USECOND))) { \ (val) = op(args); \ break; \ |