Merge "USB: core: only clean up what we allocated"