dwc3: gadget: Fix improper merge conflict resolution

Commit 71ce1d94 ("Merge remote-tracking branch 'tmp-44e63be6' into
4.9") tried to get upstream commit de288e36fe33 ("usb: dwc3: gadget:
delay unmap of bounced requests") which resulted into merge conflict.
previous merge conflict is not proper, hence fix the same.

Change-Id: I1178b59bcee11977cdf7ac6e5d5d166f27a323e0
Signed-off-by: Mayank Rana <mrana@codeaurora.org>