From 652e0ab582e4e8e01beee8755e6ad7ba02751ad7 Mon Sep 17 00:00:00 2001 From: Johannes Anderwald Date: Mon, 30 Jan 2012 13:31:05 +0000 Subject: [PATCH] [KBDHID] - Fix typo [USBCCGP] - Remove unused variable svn path=/branches/usb-bringup-trunk/; revision=55327 --- drivers/hid/kbdhid/kbdhid.c | 2 +- drivers/usb/usbccgp/pdo.c | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/drivers/hid/kbdhid/kbdhid.c b/drivers/hid/kbdhid/kbdhid.c index 189725a7df3..a7f957c64b3 100644 --- a/drivers/hid/kbdhid/kbdhid.c +++ b/drivers/hid/kbdhid/kbdhid.c @@ -575,7 +575,7 @@ KbdHid_StartDevice( MmBuildMdlForNonPagedPool(DeviceExtension->ReportMDL); /* get max number of buttons */ - Buttons = HidP_MaxUsageListLength(HidP_Input, HID_USAGE_PAGE_BUTTON, PreparsedData); + Buttons = HidP_MaxUsageListLength(HidP_Input, HID_USAGE_PAGE_KEYBOARD, PreparsedData); DPRINT1("[KBDHID] Buttons %lu\n", Buttons); ASSERT(Buttons > 0); diff --git a/drivers/usb/usbccgp/pdo.c b/drivers/usb/usbccgp/pdo.c index 77c83a20bbb..2d19870cd6e 100644 --- a/drivers/usb/usbccgp/pdo.c +++ b/drivers/usb/usbccgp/pdo.c @@ -188,7 +188,6 @@ USBCCGP_PdoHandleQueryId( { PIO_STACK_LOCATION IoStack; PUNICODE_STRING DeviceString = NULL; - UNICODE_STRING TempString; PPDO_DEVICE_EXTENSION PDODeviceExtension; NTSTATUS Status; LPWSTR Buffer; @@ -855,12 +854,10 @@ PDO_HandleInternalDeviceControl( return Status; } } - else if (Urb->UrbHeader.Function == URB_FUNCTION_GET_DESCRIPTOR_FROM_INTERFACE) + else { - DPRINT1("URB_FUNCTION_GET_DESCRIPTOR_FROM_INTERFACE\n"); IoSkipCurrentIrpStackLocation(Irp); Status = IoCallDriver(PDODeviceExtension->NextDeviceObject, Irp); - DPRINT1("URB_FUNCTION_GET_DESCRIPTOR_FROM_INTERFACE Status %x\n", Status); return Status; } }