Don't return when we're inside local_irq_disable(), use goto exit instead.
Also, cleanup some whitespace errors.