USB: revert more upstream Linux changes to fix error