PERFORCE change 146213 for review

[Sam Leffler]

http://perforce.freebsd.org/chv.cgi?CH=146213

Change 146213 by sam at sam_ebb on 2008/07/29 17:06:01

	missed IFC

Affected files ...

.. //depot/projects/vap/sys/dev/usb/ohci.c#8 integrate

Differences ...

==== //depot/projects/vap/sys/dev/usb/ohci.c#8 (text+ko) ====

@@ -13,7 +13,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/usb/ohci.c,v 1.172 2008/05/13 20:58:08 marius Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/usb/ohci.c,v 1.173 2008/07/17 22:40:23 luoqi Exp $");
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -815,20 +815,19 @@
 ohci_controller_init(ohci_softc_t *sc)
 {
 	int i;
-	u_int32_t s, ctl, ival, hcr, fm, per, desca;
+	u_int32_t ctl, ival, hcr, fm, per, desca;
 
 	/* Determine in what context we are running. */
 	ctl = OREAD4(sc, OHCI_CONTROL);
 	if (ctl & OHCI_IR) {
 		/* SMM active, request change */
 		DPRINTF(("ohci_init: SMM active, request owner change\n"));
-		s = OREAD4(sc, OHCI_COMMAND_STATUS);
-		OWRITE4(sc, OHCI_COMMAND_STATUS, s | OHCI_OCR);
+		OWRITE4(sc, OHCI_COMMAND_STATUS, OHCI_OCR);
 		for (i = 0; i < 100 && (ctl & OHCI_IR); i++) {
 			usb_delay_ms(&sc->sc_bus, 1);
 			ctl = OREAD4(sc, OHCI_CONTROL);
 		}
-		if ((ctl & OHCI_IR) == 0) {
+		if (ctl & OHCI_IR) {
 			printf("%s: SMM does not respond, resetting\n",
 			       device_get_nameunit(sc->sc_bus.bdev));
 			OWRITE4(sc, OHCI_CONTROL, OHCI_HCFS_RESET);