From: Selvin Xavier Date: Mon, 8 Oct 2018 10:28:03 +0000 (-0700) Subject: RDMA/bnxt_re: Wait for delayed work to finish before device removal X-Git-Tag: v4.20-rc1~110^2~34 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a08b9e9a705675ba05fa44f0342e2875fd1bda28;p=thirdparty%2Fkernel%2Flinux.git RDMA/bnxt_re: Wait for delayed work to finish before device removal Delayed work bnxt_re_worker would be still running even after cancel_delayed_work returns. This causes crash as the driver proceeds with device removal. To make sure that the work is finished before returning, use cancel_delayed_work_sync. Signed-off-by: Selvin Xavier Signed-off-by: Jason Gunthorpe --- diff --git a/drivers/infiniband/hw/bnxt_re/main.c b/drivers/infiniband/hw/bnxt_re/main.c index 2b1d00d78ad17..75a54c58fdc68 100644 --- a/drivers/infiniband/hw/bnxt_re/main.c +++ b/drivers/infiniband/hw/bnxt_re/main.c @@ -1203,7 +1203,7 @@ static void bnxt_re_ib_unreg(struct bnxt_re_dev *rdev) bnxt_re_unregister_ib(rdev); } if (test_and_clear_bit(BNXT_RE_FLAG_QOS_WORK_REG, &rdev->flags)) - cancel_delayed_work(&rdev->worker); + cancel_delayed_work_sync(&rdev->worker); bnxt_re_cleanup_res(rdev); bnxt_re_free_res(rdev);