cma: Remove potential deadlock situation