Fix ambiguity of ret causing -Wsequence-point error

Change-Id: Ia851b2dea8e353db6231cfd1abfd535d49e03b7a