Merge "Slimbus: Correct the conditional check during channel removal"