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
This commit is contained in:
vanjeff 2008-03-07 05:51:04 +00:00
parent 557cb8cc76
commit 9935f927a2

View File

@ -956,8 +956,8 @@ MatchUsbClass (
// //
// If class or subclass or protocol is 0, the counterparts in interface should be checked. // If class or subclass or protocol is 0, the counterparts in interface should be checked.
// //
if (DevDesc->DeviceClass == 0 && if (DevDesc->DeviceClass == 0 ||
DevDesc->DeviceSubClass == 0 && DevDesc->DeviceSubClass == 0 ||
DevDesc->DeviceProtocol == 0) { DevDesc->DeviceProtocol == 0) {
if ((UsbClassDevicePathPtr->DeviceClass == ActIfDesc->InterfaceClass || if ((UsbClassDevicePathPtr->DeviceClass == ActIfDesc->InterfaceClass ||
@ -969,7 +969,7 @@ MatchUsbClass (
return TRUE; return TRUE;
} }
} else if ((UsbClassDevicePathPtr->DeviceClass != DevDesc->DeviceClass || } else if ((UsbClassDevicePathPtr->DeviceClass == DevDesc->DeviceClass ||
UsbClassDevicePathPtr->DeviceClass == 0xff) && UsbClassDevicePathPtr->DeviceClass == 0xff) &&
(UsbClassDevicePathPtr->DeviceSubClass == DevDesc->DeviceSubClass || (UsbClassDevicePathPtr->DeviceSubClass == DevDesc->DeviceSubClass ||
UsbClassDevicePathPtr->DeviceSubClass == 0xff) && UsbClassDevicePathPtr->DeviceSubClass == 0xff) &&