From f18b8ab97a952e3ab839bdbe3624aa2fef476f6e Mon Sep 17 00:00:00 2001 From: Felipe Balbi Date: Mon, 27 Jun 2011 15:57:12 +0300 Subject: [PATCH] --- yaml --- r: 259257 b: refs/heads/master c: 8220796df85d58a445863424b7b2053d4741e931 h: refs/heads/master i: 259255: fb939c03a5da9a1d431a591417eb702b249af5ce v: v3 --- [refs] | 2 +- trunk/drivers/usb/musb/musb_core.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 8b242d03d55b..41f8c42e0b08 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ded1ddbf92ee2c8f04af7fe805e1074be5d41f7f +refs/heads/master: 8220796df85d58a445863424b7b2053d4741e931 diff --git a/trunk/drivers/usb/musb/musb_core.c b/trunk/drivers/usb/musb/musb_core.c index e2ab45219855..c6ab321416bf 100644 --- a/trunk/drivers/usb/musb/musb_core.c +++ b/trunk/drivers/usb/musb/musb_core.c @@ -2286,9 +2286,8 @@ static void musb_restore_context(struct musb *musb) static int musb_suspend(struct device *dev) { - struct platform_device *pdev = to_platform_device(dev); + struct musb *musb = dev_to_musb(dev); unsigned long flags; - struct musb *musb = dev_to_musb(&pdev->dev); spin_lock_irqsave(&musb->lock, flags); @@ -2310,8 +2309,7 @@ static int musb_suspend(struct device *dev) static int musb_resume_noirq(struct device *dev) { - struct platform_device *pdev = to_platform_device(dev); - struct musb *musb = dev_to_musb(&pdev->dev); + struct musb *musb = dev_to_musb(dev); musb_restore_context(musb);