2 files changed, 3 insertions, 3 deletions

diff --git a/drivers/usb/core/driver.c b/drivers/usb/core/driver.c
index 7c3aaa9c5402..96d3f852f4ad 100644
--- a/drivers/usb/core/driver.c
+++ b/drivers/usb/core/driver.c
@@ -534,8 +534,8 @@ const struct usb_device_id *usb_match_id(struct usb_interface *interface,
            id->driver_info is the way to create an entry that
            indicates that the driver want to examine every
            device and interface. */
-        for (; id->idVendor || id->bDeviceClass || id->bInterfaceClass ||
-               id->driver_info; id++) {
+        for (; id->idVendor || id->idProduct || id->bDeviceClass ||
+               id->bInterfaceClass || id->driver_info; id++) {
                 if (usb_match_one_id(interface, id))
                         return id;
         }
diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c
index d802b5afae89..9ddf944cce29 100644
--- a/scripts/mod/file2alias.c
+++ b/scripts/mod/file2alias.c
@@ -155,7 +155,7 @@ static void do_usb_entry_multi(struct usb_device_id *id, struct module *mod)
          * Some modules (visor) have empty slots as placeholder for
          * run-time specification that results in catch-all alias
          */
-        if (!(id->idVendor | id->bDeviceClass | id->bInterfaceClass))
+        if (!(id->idVendor | id->idProduct | id->bDeviceClass | id->bInterfaceClass))
                 return;
 
         /* Convert numeric bcdDevice range into fnmatch-able pattern(s) */