From: Kevin O'Connor <kevin@koconnor.net>
Date: Tue, 1 Apr 2014 03:50:42 +0000 (-0400)
Subject: usb: Only disable HID devices if both USB_MOUSE and USB_KEYBOARD are off.
X-Git-Tag: rel-1.7.5-rc1~30
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=48dc6a65d53781390562c80004cb24ba83f0a822;p=seabios.git

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>
---

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 @@ usb_mouse_setup(struct usbdevice_s *usbdev
 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);