Merge tag 'drm-fixes-2023-01-01' of git://anongit.freedesktop.org/drm/drm

[platform/kernel/linux-rpi.git] / block / blk-iolatency.c

diff --git a/block/blk-iolatency.c b/block/blk-iolatency.c
index 778a005..ecdc107 100644 (file)
--- a/block/blk-iolatency.c
+++ b/block/blk-iolatency.c
@@ -644,7 +644,7 @@ static void blkcg_iolatency_exit(struct rq_qos *rqos)
 {
        struct blk_iolatency *blkiolat = BLKIOLATENCY(rqos);
 
-       del_timer_sync(&blkiolat->timer);
+       timer_shutdown_sync(&blkiolat->timer);
        flush_work(&blkiolat->enable_work);
        blkcg_deactivate_policy(rqos->q, &blkcg_policy_iolatency);
        kfree(blkiolat);