From 1d550725ded1698bd73837197fde2553eec81d89 Mon Sep 17 00:00:00 2001 From: Sebastian Andrzej Siewior Date: Fri, 17 Jun 2011 19:43:13 +0200 Subject: [PATCH] --- yaml --- r: 259243 b: refs/heads/master c: fc0b721f27beb5464d9fb5e521f5cd68127dd14e h: refs/heads/master i: 259241: b0ee6446f0d40c9bc4a54e029cac4c24cd05da79 259239: ffa00c07915a34c364fb5b92b3bdafff979b16fd v: v3 --- [refs] | 2 +- trunk/drivers/usb/gadget/dummy_hcd.c | 37 ++++++++++++++-------------- 2 files changed, 19 insertions(+), 20 deletions(-) diff --git a/[refs] b/[refs] index 4f8c06fb737e..a5ebec7dd4a4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4baa74fe32f330d464d59a00d01980fd16a15ecc +refs/heads/master: fc0b721f27beb5464d9fb5e521f5cd68127dd14e diff --git a/trunk/drivers/usb/gadget/dummy_hcd.c b/trunk/drivers/usb/gadget/dummy_hcd.c index 6d189e1b5710..1916360072ad 100644 --- a/trunk/drivers/usb/gadget/dummy_hcd.c +++ b/trunk/drivers/usb/gadget/dummy_hcd.c @@ -1030,34 +1030,33 @@ static int dummy_udc_remove (struct platform_device *pdev) return 0; } -static int dummy_udc_suspend (struct platform_device *pdev, pm_message_t state) +static void dummy_udc_pm(struct dummy *dum, struct dummy_hcd *dum_hcd, + int suspend) { - struct dummy *dum = platform_get_drvdata(pdev); - struct dummy_hcd *dum_hcd; - - dev_dbg (&pdev->dev, "%s\n", __func__); - dum_hcd = gadget_to_dummy_hcd(&dum->gadget); - spin_lock_irq (&dum->lock); - dum->udc_suspended = 1; + spin_lock_irq(&dum->lock); + dum->udc_suspended = suspend; set_link_state(dum_hcd); - spin_unlock_irq (&dum->lock); + spin_unlock_irq(&dum->lock); +} + +static int dummy_udc_suspend(struct platform_device *pdev, pm_message_t state) +{ + struct dummy *dum = platform_get_drvdata(pdev); + struct dummy_hcd *dum_hcd = gadget_to_dummy_hcd(&dum->gadget); + dev_dbg(&pdev->dev, "%s\n", __func__); + dummy_udc_pm(dum, dum_hcd, 1); usb_hcd_poll_rh_status(dummy_hcd_to_hcd(dum_hcd)); return 0; } -static int dummy_udc_resume (struct platform_device *pdev) +static int dummy_udc_resume(struct platform_device *pdev) { - struct dummy *dum = platform_get_drvdata(pdev); - struct dummy_hcd *dum_hcd; - - dev_dbg (&pdev->dev, "%s\n", __func__); - dum_hcd = gadget_to_dummy_hcd(&dum->gadget); - spin_lock_irq (&dum->lock); - dum->udc_suspended = 0; - set_link_state(dum_hcd); - spin_unlock_irq (&dum->lock); + struct dummy *dum = platform_get_drvdata(pdev); + struct dummy_hcd *dum_hcd = gadget_to_dummy_hcd(&dum->gadget); + dev_dbg(&pdev->dev, "%s\n", __func__); + dummy_udc_pm(dum, dum_hcd, 0); usb_hcd_poll_rh_status(dummy_hcd_to_hcd(dum_hcd)); return 0; }