57 lines
1.8 KiB
Diff
57 lines
1.8 KiB
Diff
From b9a61b80ea89d9d6d78a23d96a28df94fd612298 Mon Sep 17 00:00:00 2001
|
|
From: Kim Kyuwon <q1.kim-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org>
|
|
Date: Thu, 26 Mar 2009 18:56:51 -0700
|
|
Subject: [PATCH] musb: fix possible panic while resuming
|
|
|
|
During driver resume processing, musb could cause a kernel panic.
|
|
Fix by enabling the clock earlier, with the resume_early method.
|
|
|
|
Signed-off-by: Kim Kyuwon <q1.kim-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org>
|
|
Signed-off-by: David Brownell <dbrownell-Rn4VEauK+AKRv+LV9MX5uipxlwaOVQ5f@public.gmane.org>
|
|
---
|
|
drivers/usb/musb/musb_core.c | 8 ++------
|
|
1 files changed, 2 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c
|
|
index 338cd16..3019725 100644
|
|
--- a/drivers/usb/musb/musb_core.c
|
|
+++ b/drivers/usb/musb/musb_core.c
|
|
@@ -2170,16 +2170,13 @@ static int musb_suspend(struct platform_device *pdev, pm_message_t message)
|
|
return 0;
|
|
}
|
|
|
|
-static int musb_resume(struct platform_device *pdev)
|
|
+static int musb_resume_early(struct platform_device *pdev)
|
|
{
|
|
- unsigned long flags;
|
|
struct musb *musb = dev_to_musb(&pdev->dev);
|
|
|
|
if (!musb->clock)
|
|
return 0;
|
|
|
|
- spin_lock_irqsave(&musb->lock, flags);
|
|
-
|
|
if (musb->set_clock)
|
|
musb->set_clock(musb->clock, 1);
|
|
else
|
|
@@ -2189,7 +2186,6 @@ static int musb_resume(struct platform_device *pdev)
|
|
* unless for some reason the whole soc powered down and we're
|
|
* not treating that as a whole-system restart (e.g. swsusp)
|
|
*/
|
|
- spin_unlock_irqrestore(&musb->lock, flags);
|
|
return 0;
|
|
}
|
|
|
|
@@ -2207,7 +2203,7 @@ static struct platform_driver musb_driver = {
|
|
.remove = __devexit_p(musb_remove),
|
|
.shutdown = musb_shutdown,
|
|
.suspend = musb_suspend,
|
|
- .resume = musb_resume,
|
|
+ .resume_early = musb_resume_early,
|
|
};
|
|
|
|
/*-------------------------------------------------------------------------*/
|
|
--
|
|
1.6.0.4
|
|
|