From: mglocker <mglocker@openbsd.org>
Date: Sat, 9 Aug 2008 07:57:48 +0000 (+0000)
Subject: Prepare for ehci:  If GET_DEF request has failed, wait a moment before
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=bbd29df81e8d2a0c92c3e6127d6b8537bd7a0eee;p=openbsd

Prepare for ehci:  If GET_DEF request has failed, wait a moment before
issuing GET_CUR.  Makes my NX6000 attach on ehci.
---

diff --git a/sys/dev/usb/uvideo.c b/sys/dev/usb/uvideo.c
index fb635cb511b..b4c3307989c 100644
--- a/sys/dev/usb/uvideo.c
+++ b/sys/dev/usb/uvideo.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uvideo.c,v 1.75 2008/08/02 21:52:37 mglocker Exp $ */
+/*	$OpenBSD: uvideo.c,v 1.76 2008/08/09 07:57:48 mglocker Exp $ */
 
 /*
  * Copyright (c) 2008 Robert Nagy <robert@openbsd.org>
@@ -1035,6 +1035,9 @@ uvideo_vs_negotiation(struct uvideo_softc *sc, int commit)
 	bzero(probe_data, sizeof(probe_data));
 	error = uvideo_vs_get_probe(sc, probe_data, GET_DEF);
 	if (error != USBD_NORMAL_COMPLETION) {
+		/* relax a moment and retry with GET_CUR */
+		usbd_delay_ms(sc->sc_udev, 100);
+
 		error = uvideo_vs_get_probe(sc, probe_data, GET_CUR);
 		if (error != USBD_NORMAL_COMPLETION)
 			return (error);