Remove unnecessary checks and fix an issue where the interrupt handler
could return with lock held.