diff options
| author | Andrey Zhizhikin <andrey.z@gmail.com> | 2020-08-20 14:26:04 +0000 |
|---|---|---|
| committer | Andrey Zhizhikin <andrey.z@gmail.com> | 2020-08-20 14:26:04 +0000 |
| commit | b66890eae17a10b50a94472de6ed095ff8ebd315 (patch) | |
| tree | 27a2be46771b907d0f6bc78825ad9d1e8b72477b /block | |
| parent | 397a487c917f91e3fbca6c9a1a5bffb779d42e76 (diff) | |
| parent | f61e1c3638dddaa1a1f3bb59d2bc288d9f0f1b5b (diff) | |
Merge tag 'v5.4.59' into 5.4-2.1.x-imx
This is the 5.4.59 stable release
Conflicts (manual resolve):
drivers/gpu/drm/imx/dw_hdmi-imx.c:
drivers/gpu/drm/imx/imx-ldb.c:
drivers/gpu/drm/imx/ipuv3/ipuv3-crtc.c:
Port changes from upstream commit [1a279871012d3], which extends
component lifetime by moving drm structures allocation/free from
bind() to probe().
sound/soc/fsl/fsl_sai.c:
Apply patch [b8ae2bf5ccc66] from upstream, which uses FIFO watermark
mask macro.
Signed-off-by: Andrey Zhizhikin <andrey.z@gmail.com>
Diffstat (limited to 'block')
| -rw-r--r-- | block/blk-iocost.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/block/blk-iocost.c b/block/blk-iocost.c index 4d2bda812d9b..dcc6685d5bec 100644 --- a/block/blk-iocost.c +++ b/block/blk-iocost.c @@ -1377,7 +1377,7 @@ static void ioc_timer_fn(struct timer_list *timer) * should have woken up in the last period and expire idle iocgs. */ list_for_each_entry_safe(iocg, tiocg, &ioc->active_iocgs, active_list) { - if (!waitqueue_active(&iocg->waitq) && iocg->abs_vdebt && + if (!waitqueue_active(&iocg->waitq) && !iocg->abs_vdebt && !iocg_is_idle(iocg)) continue; |