This patch removes redundant condition.

 (!A || (A && B)) is the same as (!A || B).

Fixes indentation too.

Tested by: compilation only
Caught by: cppcheck
Signed-off-by: NGeyslan G. Bem <geyslan@gmail.com>
Signed-off-by: NFelipe Balbi <balbi@ti.com>