Fix unfortunate mismerge between the fixes and sony branch causing
code duplication and unterminated basic block.
Signed-off-by: NJiri Kosina <jkosina@suse.cz>