Reverted upstream Linux changes to USB