Fix deadlock issues previously resolved upstream but reintroduced due to not properly solved rebase conflicts in the past.
REFERENCE: https://github.com/nxp-imx/linux-imx/pull/21