dwc_otg: fix bad merge