Merger tracker:Fixed a USB bus driver logic error

git-svn-id: https://edk2.tianocore.org/svn/edk2/trunk@4805 de2fecce-e211-0410-80a6-f3fac2684e05

diff --git a/edk2/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbUtility.c b/edk2/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbUtility.c
index 3badf89..cd3e72e 100644 (file)
--- a/edk2/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbUtility.c
+++ b/edk2/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbUtility.c
@@ -956,8 +956,8 @@ MatchUsbClass (
     //\r
     // If class or subclass or protocol is 0, the counterparts in interface should be checked.\r
     //\r
-    if (DevDesc->DeviceClass == 0 &&\r
-        DevDesc->DeviceSubClass == 0 &&\r
+    if (DevDesc->DeviceClass == 0 ||\r
+        DevDesc->DeviceSubClass == 0 ||\r
         DevDesc->DeviceProtocol == 0) {\r
 \r
       if ((UsbClassDevicePathPtr->DeviceClass == ActIfDesc->InterfaceClass ||\r
@@ -969,7 +969,7 @@ MatchUsbClass (
         return TRUE;\r
       }\r
 \r
-    } else if ((UsbClassDevicePathPtr->DeviceClass != DevDesc->DeviceClass ||\r
+    } else if ((UsbClassDevicePathPtr->DeviceClass == DevDesc->DeviceClass ||\r
                                          UsbClassDevicePathPtr->DeviceClass == 0xff) &&\r
                (UsbClassDevicePathPtr->DeviceSubClass == DevDesc->DeviceSubClass ||\r
                                       UsbClassDevicePathPtr->DeviceSubClass == 0xff) &&\r