---

yaml --- r: 212579 b: refs/heads/master c: a754aea h: refs/heads/master i: 212577: 6667d2e 212575: ca7beb1 v: v3
git-mirror · Oct 8, 2010 · f082de7 · f082de7
1 parent c07756e
commit f082de7
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 884646a5721e547d302390d8a483e9b75a31b017
+refs/heads/master: a754aea25e804d0635d1871558bee5024605ff92
diff --git a/trunk/arch/arm/mach-pxa/pxa3xx-ulpi.c b/trunk/arch/arm/mach-pxa/pxa3xx-ulpi.c
@@ -252,6 +252,10 @@ int pxa3xx_u2d_start_hc(struct usb_bus *host)
 {
 	int err = 0;
 
+	/* In case the PXA3xx ULPI isn't used, do nothing. */
+	if (!u2d)
+		return 0;
+
 	clk_enable(u2d->clk);
 
 	if (cpu_is_pxa310()) {
@@ -264,6 +268,10 @@ int pxa3xx_u2d_start_hc(struct usb_bus *host)
 
 void pxa3xx_u2d_stop_hc(struct usb_bus *host)
 {
+	/* In case the PXA3xx ULPI isn't used, do nothing. */
+	if (!u2d)
+		return;
+
 	if (cpu_is_pxa310())
 		pxa310_stop_otg_hc();