am 2abf0f24: Fix a race condition that could cause lockup

* commit '2abf0f24af60b8644d5b61eed9666793083546ee':
  Fix a race condition that could cause lockup