am e03d0322: Merge "fastboot should say which device it\'s waiting for."

* commit 'e03d0322db8ed123254482d0b0905646b16ad71e':
  fastboot should say which device it's waiting for.
This commit is contained in:
Elliott Hughes 2015-08-20 00:57:41 +00:00 committed by Android Git Automerger
commit 89b26e28a8

View file

@ -191,7 +191,7 @@ static void *load_file(const char *fn, unsigned *_sz)
int match_fastboot_with_serial(usb_ifc_info* info, const char* local_serial) {
// Require a matching vendor id if the user specified one with -i.
if (vendor_id != 0 && info->dev_vendor != vendor_id) {
if (vendor_id != 0 && info->dev_vendor != vendor_id) {
return -1;
}
@ -246,7 +246,7 @@ usb_handle *open_device(void)
if(usb) return usb;
if(announce) {
announce = 0;
fprintf(stderr,"< waiting for device >\n");
fprintf(stderr, "< waiting for %s >\n", serial ? serial : "any device");
}
usleep(1000);
}