commit 48dc6a65d53781390562c80004cb24ba83f0a822
author Kevin O'Connor <kevin@koconnor.net> Mon Mar 31 23:50:42 2014 -0400
committer Kevin O'Connor <kevin@koconnor.net> Sat Apr 05 09:18:59 2014 -0400
tree 3f82ccb0b4239af2ae86c5460dab97db59430e5c
parent 8abc6a895a67b711997fb96beb6b8e7ae47fe059

usb: Only disable HID devices if both USB_MOUSE and USB_KEYBOARD are off.

Fix typo in code causing both CONFIG_USB_MOUSE and CONFIG_USB_KEYBOARD
to be effectively disabled if either is disabled.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>

src/hw/usb-hid.c

diff --git a/src/hw/usb-hid.c b/src/hw/usb-hid.c
index e94aa16..13f134c 100644
--- a/src/hw/usb-hid.c
+++ b/src/hw/usb-hid.c
@@ -109,7 +109,7 @@
 int
 usb_hid_setup(struct usbdevice_s *usbdev)
 {
-    if (! CONFIG_USB_KEYBOARD || ! CONFIG_USB_MOUSE)
+    if (! CONFIG_USB_KEYBOARD && ! CONFIG_USB_MOUSE)
         return -1;
     dprintf(2, "usb_hid_setup %p\n", usbdev->defpipe);