From f082de73a3cddd027a0b8a2c52b102f76af9f834 Mon Sep 17 00:00:00 2001
From: Marek Vasut <marek.vasut@gmail.com>
Date: Fri, 3 Sep 2010 22:35:46 +0200
Subject: [PATCH] --- yaml --- r: 212579 b: refs/heads/master c:
 a754aea25e804d0635d1871558bee5024605ff92 h: refs/heads/master i:   212577:
 6667d2efb41c76980f8b69d70258b2b69aaae01f   212575:
 ca7beb1a02a656ee59f7078b34d564804f7d7365 v: v3

---
 [refs]                                | 2 +-
 trunk/arch/arm/mach-pxa/pxa3xx-ulpi.c | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 43389defb06b..0b133fd39bcc 100644
--- 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
index e57439e01171..ce7168b233e2 100644
--- 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();