Merge "ion: Add missing unlock on error path"