msm: ipa: merge error fix

Changes to wrap the code properly after if() condition
to avoid asserting for non hardware critical cases.

Change-Id: I3aae5674bbf23caeaf19e56f72db6d6d3c5c9fcf
Acked-by: Jyothi Jayanthi <jyothij@qti.qualcomm.com>
Signed-off-by: Michael Adisumarta <madisuma@codeaurora.org>