summaryrefslogtreecommitdiffstats
path: root/src/usb-device.c
diff options
context:
space:
mode:
authorPali Rohár <pali.rohar@gmail.com>2012-08-11 15:24:46 +0200
committerPali Rohár <pali.rohar@gmail.com>2012-08-11 15:24:46 +0200
commit6062a736d2046c0b1f23d62ef58d173413e3d6f2 (patch)
treeda9e099235ed5f624b759a6306fe5767292bbf90 /src/usb-device.c
parent6cd01df098d5ba86aa23580e20b3c327b2177658 (diff)
download0xFFFF-6062a736d2046c0b1f23d62ef58d173413e3d6f2.tar.bz2
usb-device: Fix usb_descriptor_info_print and Mk II name
Diffstat (limited to 'src/usb-device.c')
-rw-r--r--src/usb-device.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/usb-device.c b/src/usb-device.c
index e33cac0..9042b63 100644
--- a/src/usb-device.c
+++ b/src/usb-device.c
@@ -42,7 +42,7 @@ static struct usb_flash_device usb_devices[] = {
static const char * usb_flash_protocols[] = {
[FLASH_NOLO] = "NOLO",
[FLASH_COLD] = "Cold flashing",
- [FLASH_MKII] = "Mkii protcol",
+ [FLASH_MKII] = "Mk II protocol",
[FLASH_DISK] = "RAW disk",
};
@@ -93,7 +93,7 @@ static void usb_descriptor_info_print(usb_dev_handle * udev, struct usb_device *
break;
}
}
- PRINTF_LINE("USB device serial number string: %s", buf2[0] ? buf2 : "(not detected)");
+ PRINTF_LINE("USB device serial number string: %s", buf2[0] ? buf2 : ( buf[0] ? buf : "(not detected)" ));
PRINTF_END();
}