Skip to content

Commit

Permalink
usb: gadget: dummy_hcd: init is_otg in init_dummy_udc_hw()
Browse files Browse the repository at this point in the history
This value is now assigned during bind(). The configuration depends on
static values assigned by dummy driver itself. So there is no need to
defer this assigment until one know the actuall speed since the
configuration is static and known early.

Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Sebastian Andrzej Siewior authored and Greg Kroah-Hartman committed Jul 1, 2011
1 parent 0fb5759 commit f8744d4
Showing 1 changed file with 4 additions and 7 deletions.
11 changes: 4 additions & 7 deletions drivers/usb/gadget/dummy_hcd.c
Original file line number Diff line number Diff line change
Expand Up @@ -909,13 +909,6 @@ static int dummy_udc_start(struct usb_gadget_driver *driver,
dum->ep[0].ep.maxpacket = 64;
}

if (dum->gadget.speed == USB_SPEED_SUPER)
dum->gadget.is_otg =
(dummy_hcd_to_hcd(dum->ss_hcd)->self.otg_port != 0);
else
dum->gadget.is_otg =
(dummy_hcd_to_hcd(dum->hs_hcd)->self.otg_port != 0);

driver->driver.bus = NULL;
dum->driver = driver;
dum->gadget.dev.driver = &driver->driver;
Expand Down Expand Up @@ -990,6 +983,10 @@ static void init_dummy_udc_hw(struct dummy *dum)
dum->gadget.ep0 = &dum->ep[0].ep;
list_del_init(&dum->ep[0].ep.ep_list);
INIT_LIST_HEAD(&dum->fifo_req.queue);

#ifdef CONFIG_USB_OTG
dum->gadget.is_otg = 1;
#endif
}

static int dummy_udc_probe (struct platform_device *pdev)
Expand Down

0 comments on commit f8744d4

Please sign in to comment.