From e235d1a88c9edd18ffffba28996afa8be529365e Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Thu, 16 Dec 2010 10:04:17 -0800
Subject: [PATCH] --- yaml --- r: 226895 b: refs/heads/master c:
 2faa83e2a519abea1055d156ce1b42b8fa57e87b h: refs/heads/master i:   226893:
 dc4061521b9395f4fafe7ea68c67eedcf03d87e9   226891:
 a6449644589b42b64acf336274494c7a3ec9f68e   226887:
 46c348aea57785ee08d9a1150e75e19ec932765d   226879:
 d9ed187350c4bc4a0cc4c12173e30baaa01970d7 v: v3

---
 [refs]                             |  2 +-
 trunk/drivers/usb/musb/musb_core.c | 26 ++++++++++++++------------
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/[refs] b/[refs]
index e6d89bc93c75..2f7d70ccd975 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 224acb1839f5fbb4ba85a440f6dd30dfb0e561b6
+refs/heads/master: 2faa83e2a519abea1055d156ce1b42b8fa57e87b
diff --git a/trunk/drivers/usb/musb/musb_core.c b/trunk/drivers/usb/musb/musb_core.c
index 99beebce8550..365a4fab5c64 100644
--- a/trunk/drivers/usb/musb/musb_core.c
+++ b/trunk/drivers/usb/musb/musb_core.c
@@ -2413,6 +2413,9 @@ static int musb_suspend(struct device *dev)
 	unsigned long	flags;
 	struct musb	*musb = dev_to_musb(&pdev->dev);
 
+	if (!musb->clock)
+		return 0;
+
 	spin_lock_irqsave(&musb->lock, flags);
 
 	if (is_peripheral_active(musb)) {
@@ -2427,12 +2430,10 @@ static int musb_suspend(struct device *dev)
 
 	musb_save_context(musb);
 
-	if (musb->clock) {
-		if (musb->set_clock)
-			musb->set_clock(musb->clock, 0);
-		else
-			clk_disable(musb->clock);
-	}
+	if (musb->set_clock)
+		musb->set_clock(musb->clock, 0);
+	else
+		clk_disable(musb->clock);
 	spin_unlock_irqrestore(&musb->lock, flags);
 	return 0;
 }
@@ -2442,12 +2443,13 @@ static int musb_resume_noirq(struct device *dev)
 	struct platform_device *pdev = to_platform_device(dev);
 	struct musb	*musb = dev_to_musb(&pdev->dev);
 
-	if (musb->clock) {
-		if (musb->set_clock)
-			musb->set_clock(musb->clock, 1);
-		else
-			clk_enable(musb->clock);
-	}
+	if (!musb->clock)
+		return 0;
+
+	if (musb->set_clock)
+		musb->set_clock(musb->clock, 1);
+	else
+		clk_enable(musb->clock);
 
 	musb_restore_context(musb);