The code can be rearranged so that some goto paths can be removed
Signed-off-by: NAndi Shyti <andi.shyti@samsung.com>
Signed-off-by: NMauro Carvalho Chehab <mchehab@s-opensource.com>