diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2011-06-15 09:03:22 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-06-15 09:03:22 -0500 |
| commit | f897235e0a0840c44645b609dc52a4c47ddfc3d5 (patch) | |
| tree | d359072175034e3c5a70314e36c2ee76a8424910 /hw/usb-hid.c | |
| parent | 1f8bedba79f453596b06e9ebbfa2be8db1eccb68 (diff) | |
| parent | 94cc916a8c7e631afc650cb3c9c2832167b0dd8f (diff) | |
Merge remote-tracking branch 'kraxel/usb.16' into staging
Diffstat (limited to 'hw/usb-hid.c')
| -rw-r--r-- | hw/usb-hid.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/hw/usb-hid.c b/hw/usb-hid.c index 53b261c3b9..d711b5c0be 100644 --- a/hw/usb-hid.c +++ b/hw/usb-hid.c @@ -142,7 +142,6 @@ static const USBDescIface desc_iface_tablet = { .bInterfaceNumber = 0, .bNumEndpoints = 1, .bInterfaceClass = USB_CLASS_HID, - .bInterfaceSubClass = 0x01, /* boot */ .bInterfaceProtocol = 0x02, .ndesc = 1, .descs = (USBDescOther[]) { @@ -782,13 +781,13 @@ static int usb_hid_handle_control(USBDevice *dev, USBPacket *p, goto fail; break; case GET_PROTOCOL: - if (s->kind != USB_KEYBOARD) + if (s->kind != USB_KEYBOARD && s->kind != USB_MOUSE) goto fail; ret = 1; data[0] = s->protocol; break; case SET_PROTOCOL: - if (s->kind != USB_KEYBOARD) + if (s->kind != USB_KEYBOARD && s->kind != USB_MOUSE) goto fail; ret = 0; s->protocol = value; |