diff options
| author | vanjeff <vanjeff@6f19259b-4bc3-4df7-8a09-765794883524> | 2008-03-07 05:51:04 +0000 |
|---|---|---|
| committer | vanjeff <vanjeff@6f19259b-4bc3-4df7-8a09-765794883524> | 2008-03-07 05:51:04 +0000 |
| commit | 9935f927a2412b066e4c538ab9face2fbc4897a3 (patch) | |
| tree | 32c0fe0e1f90603db375b1e617ab66bd1f7182b6 /MdeModulePkg | |
| parent | 557cb8cc760ec891709fd115f9493aaf63b73d63 (diff) | |
| download | edk2-9935f927a2412b066e4c538ab9face2fbc4897a3.zip edk2-9935f927a2412b066e4c538ab9face2fbc4897a3.tar.gz edk2-9935f927a2412b066e4c538ab9face2fbc4897a3.tar.bz2 | |
Merger tracker:Fixed a USB bus driver logic error
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@4805 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'MdeModulePkg')
| -rw-r--r-- | MdeModulePkg/Bus/Usb/UsbBusDxe/UsbUtility.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbUtility.c b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbUtility.c index 3badf89..cd3e72e 100644 --- a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbUtility.c +++ b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbUtility.c @@ -956,8 +956,8 @@ MatchUsbClass ( //
// If class or subclass or protocol is 0, the counterparts in interface should be checked.
//
- if (DevDesc->DeviceClass == 0 &&
- DevDesc->DeviceSubClass == 0 &&
+ if (DevDesc->DeviceClass == 0 ||
+ DevDesc->DeviceSubClass == 0 ||
DevDesc->DeviceProtocol == 0) {
if ((UsbClassDevicePathPtr->DeviceClass == ActIfDesc->InterfaceClass ||
@@ -969,7 +969,7 @@ MatchUsbClass ( return TRUE;
}
- } else if ((UsbClassDevicePathPtr->DeviceClass != DevDesc->DeviceClass ||
+ } else if ((UsbClassDevicePathPtr->DeviceClass == DevDesc->DeviceClass ||
UsbClassDevicePathPtr->DeviceClass == 0xff) &&
(UsbClassDevicePathPtr->DeviceSubClass == DevDesc->DeviceSubClass ||
UsbClassDevicePathPtr->DeviceSubClass == 0xff) &&
|