summaryrefslogtreecommitdiffstats
path: root/common
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2015-12-17 21:46:04 -0500
committerTom Rini <trini@konsulko.com>2015-12-17 21:46:04 -0500
commit123b70177931a5aed92beca76bb622b2f4005be8 (patch)
tree83955f114744e2450e828ee5a183962287f43038 /common
parent9cddb4fe0266484aab9babdd2ebe650021644ea9 (diff)
parente4b70d80350c1238fa07872d71c19e3ddbf53b76 (diff)
downloadblackbird-obmc-uboot-123b70177931a5aed92beca76bb622b2f4005be8.tar.gz
blackbird-obmc-uboot-123b70177931a5aed92beca76bb622b2f4005be8.zip
Merge branch 'master' of git://git.denx.de/u-boot-usb
Diffstat (limited to 'common')
-rw-r--r--common/usb_kbd.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/common/usb_kbd.c b/common/usb_kbd.c
index 069fbd2de7..9617a4848a 100644
--- a/common/usb_kbd.c
+++ b/common/usb_kbd.c
@@ -476,6 +476,9 @@ static int usb_kbd_probe_dev(struct usb_device *dev, unsigned int ifnum)
USB_KBD_BOOT_REPORT_SIZE, data->new,
data->intinterval);
if (!data->intq) {
+#elif defined(CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP)
+ if (usb_get_report(dev, iface->desc.bInterfaceNumber,
+ 1, 0, data->new, USB_KBD_BOOT_REPORT_SIZE) < 0) {
#else
if (usb_submit_int_msg(dev, data->intpipe, data->new, data->intpktsize,
data->intinterval) < 0) {
OpenPOWER on IntegriCloud