Merge "usb: Fix race between diag_function_disable() and usb_diag_write()"