diff options
author | Ignacio Casal Quinteiro <icq@gnome.org> | 2015-01-08 13:21:17 +0100 |
---|---|---|
committer | Ignacio Casal Quinteiro <icq@gnome.org> | 2015-01-08 13:21:17 +0100 |
commit | 2142dec39c85c24d433374408b8d95d90dbf3abf (patch) | |
tree | 290f1d500287251a46048d33a732c95e3af9cef8 /tools/gusb-main.c | |
parent | 7f2788455392c6c4e89b33f256f571e5da3a1922 (diff) | |
download | gusb-2142dec39c85c24d433374408b8d95d90dbf3abf.tar.gz |
gusb: minor cleanup
Diffstat (limited to 'tools/gusb-main.c')
-rw-r--r-- | tools/gusb-main.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/tools/gusb-main.c b/tools/gusb-main.c index c12b418..a850877 100644 --- a/tools/gusb-main.c +++ b/tools/gusb-main.c @@ -246,6 +246,7 @@ moo_cb (GNode *node, gpointer data) if (tmp != NULL) vendor = g_strdup (tmp); } + if (product == NULL) { tmp = g_usb_device_get_pid_as_str (device); if (tmp != NULL) @@ -253,14 +254,14 @@ moo_cb (GNode *node, gpointer data) } /* a hub */ - if (g_usb_device_get_device_class (device) == 0x09) { - if (product == NULL) - product = g_strdup ("USB HUB"); + if (g_usb_device_get_device_class (device) == 0x09 && product == NULL) { + product = g_strdup ("USB HUB"); } /* fall back to the VID/PID */ if (product == NULL) product = g_strdup ("Unknown"); + if (vendor == NULL) vendor = g_strdup ("Unknown"); |