Fix ambiguity of ret: [-Wsequence-point]

Change-Id: Ia851b2dea8e353db6231cfd1abfd535d49e03b7a