Trivial manual merge fixup for usb_find_interface clashes.
Attach a file by drag & drop or click to upload
