---

yaml --- r: 108439 b: refs/heads/master c: e8b2445 h: refs/heads/master i: 108437: a940c44 108435: 6637c8d 108431: b96af3a v: v3
git-mirror · Aug 14, 2008 · 2525715 · 2525715
1 parent 3eb2e68
commit 2525715
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1133cd8adf34709e1857d1491e9fae5597b51ad5
+refs/heads/master: e8b24450a635bbbd3a2b4c2649eef060c742ebc0
diff --git a/trunk/drivers/usb/host/ohci-hub.c b/trunk/drivers/usb/host/ohci-hub.c
@@ -579,8 +579,6 @@ static int ohci_start_port_reset (struct usb_hcd *hcd, unsigned port)
 	return 0;
 }
 
-static void start_hnp(struct ohci_hcd *ohci);
-
 #else
 
 #define	ohci_start_port_reset		NULL
@@ -767,7 +765,7 @@ static int ohci_hub_control (
 #ifdef	CONFIG_USB_OTG
 			if (hcd->self.otg_port == (wIndex + 1)
 					&& hcd->self.b_hnp_enable)
-				start_hnp(ohci);
+				ohci->start_hnp(ohci);
 			else
 #endif
 			ohci_writel (ohci, RH_PS_PSS,

diff --git a/trunk/drivers/usb/host/ohci-omap.c b/trunk/drivers/usb/host/ohci-omap.c
@@ -225,6 +225,7 @@ static int ohci_omap_init(struct usb_hcd *hcd)
 			dev_err(hcd->self.controller, "can't find transceiver\n");
 			return -ENODEV;
 		}
+		ohci->start_hnp = start_hnp;
 	}
 #endif
 

diff --git a/trunk/drivers/usb/host/ohci.h b/trunk/drivers/usb/host/ohci.h
@@ -371,6 +371,7 @@ struct ohci_hcd {
 	 * other external transceivers should be software-transparent
 	 */
 	struct otg_transceiver	*transceiver;
+	void (*start_hnp)(struct ohci_hcd *ohci);
 
 	/*
 	 * memory management for queue data structures
-Original file line number
+Diff line change
@@ Expand Up / @@ -225,6 +225,7 @@ static int ohci_omap_init(struct usb_hcd *hcd) @@
     			dev_err(hcd->self.controller, "can't find transceiver\n");
     			return -ENODEV;
     		}
+    		ohci->start_hnp = start_hnp;
     	}
     #endif
@@ Expand Down @@