From b0ee6446f0d40c9bc4a54e029cac4c24cd05da79 Mon Sep 17 00:00:00 2001 From: Sebastian Andrzej Siewior Date: Fri, 17 Jun 2011 10:11:41 +0200 Subject: [PATCH] --- yaml --- r: 259241 b: refs/heads/master c: d8a14a85c72faf1bdcbbc12255361aaa9cb79ff5 h: refs/heads/master i: 259239: ffa00c07915a34c364fb5b92b3bdafff979b16fd v: v3 --- [refs] | 2 +- trunk/drivers/usb/gadget/dummy_hcd.c | 30 +++++++++++++--------------- 2 files changed, 15 insertions(+), 17 deletions(-) diff --git a/[refs] b/[refs] index d0afed36f079..e265b7f24fbd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 719e52cbc7b826fae9501f3b86b8cbc25a4c5268 +refs/heads/master: d8a14a85c72faf1bdcbbc12255361aaa9cb79ff5 diff --git a/trunk/drivers/usb/gadget/dummy_hcd.c b/trunk/drivers/usb/gadget/dummy_hcd.c index 1fc80bb8ca39..865faf0932af 100644 --- a/trunk/drivers/usb/gadget/dummy_hcd.c +++ b/trunk/drivers/usb/gadget/dummy_hcd.c @@ -809,18 +809,18 @@ static int dummy_set_selfpowered (struct usb_gadget *_gadget, int value) static int dummy_pullup (struct usb_gadget *_gadget, int value) { + struct dummy_hcd *dum_hcd; struct dummy *dum; unsigned long flags; - dum = gadget_to_dummy_hcd(_gadget)->dum; + dum_hcd = gadget_to_dummy_hcd(_gadget); + dum = dum_hcd->dum; + spin_lock_irqsave (&dum->lock, flags); dum->pullup = (value != 0); - set_link_state((dum->gadget.speed == USB_SPEED_SUPER ? - dum->ss_hcd : dum->hs_hcd)); + set_link_state(dum_hcd); spin_unlock_irqrestore (&dum->lock, flags); - usb_hcd_poll_rh_status((dum->gadget.speed == USB_SPEED_SUPER ? - dummy_hcd_to_hcd(dum->ss_hcd) : - dummy_hcd_to_hcd(dum->hs_hcd))); + usb_hcd_poll_rh_status(dummy_hcd_to_hcd(dum_hcd)); return 0; } @@ -1043,34 +1043,32 @@ static int dummy_udc_remove (struct platform_device *pdev) 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; dev_dbg (&pdev->dev, "%s\n", __func__); + dum_hcd = gadget_to_dummy_hcd(&dum->gadget); spin_lock_irq (&dum->lock); dum->udc_suspended = 1; - set_link_state((dum->gadget.speed == USB_SPEED_SUPER ? - dum->ss_hcd : dum->hs_hcd)); + set_link_state(dum_hcd); spin_unlock_irq (&dum->lock); - usb_hcd_poll_rh_status((dum->gadget.speed == USB_SPEED_SUPER ? - dummy_hcd_to_hcd(dum->ss_hcd) : - dummy_hcd_to_hcd(dum->hs_hcd))); + usb_hcd_poll_rh_status(dummy_hcd_to_hcd(dum_hcd)); return 0; } 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->gadget.speed == USB_SPEED_SUPER ? - dum->ss_hcd : dum->hs_hcd)); + set_link_state(dum_hcd); spin_unlock_irq (&dum->lock); - usb_hcd_poll_rh_status((dum->gadget.speed == USB_SPEED_SUPER ? - dummy_hcd_to_hcd(dum->ss_hcd) : - dummy_hcd_to_hcd(dum->hs_hcd))); + usb_hcd_poll_rh_status(dummy_hcd_to_hcd(dum_hcd)); return 0; }