diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2014-07-15 15:20:49 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-07-18 14:50:21 +0200 |
| commit | 99b79e4a456b6bfee07b385cca722c5da925f28b (patch) | |
| tree | c552cda9bdd8c39a04a9090892bdf693a9482c6f /drivers | |
| parent | 4bff0a0553b739427834ef7669621f08ee84dec0 (diff) | |
| download | barebox-99b79e4a456b6bfee07b385cca722c5da925f28b.tar.gz barebox-99b79e4a456b6bfee07b385cca722c5da925f28b.tar.xz | |
USB: host: detect port change only once in usb_hub_configure_port
Otherwise a device may be registered/unregistered multiple times
during scanning the hub ports.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/usb/core/hub.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c index 144442a4ca..f90a927eef 100644 --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c @@ -226,12 +226,14 @@ static void usb_hub_port_connect_change(struct usb_device *dev, int port) dev_dbg(&dev->dev, "hub: disabling port %d\n", port + 1); usb_clear_port_feature(dev, port + 1, USB_PORT_FEAT_ENABLE); } + device_detect(&usb->dev); } static int usb_hub_configure_port(struct usb_device *dev, int port) { struct usb_port_status portsts; unsigned short portstatus, portchange; + int connect_change = 0; if (usb_get_port_status(dev, port + 1, &portsts) < 0) { dev_dbg(&dev->dev, "get_port_status failed\n"); @@ -245,7 +247,7 @@ static int usb_hub_configure_port(struct usb_device *dev, int port) if (portchange & USB_PORT_STAT_C_CONNECTION) { dev_dbg(&dev->dev, "port %d connection change\n", port + 1); - usb_hub_port_connect_change(dev, port); + connect_change = 1; } if (portchange & USB_PORT_STAT_C_ENABLE) { dev_dbg(&dev->dev, "port %d enable change, status %x\n", @@ -262,9 +264,13 @@ static int usb_hub_configure_port(struct usb_device *dev, int port) dev_dbg(&dev->dev, "already running port %i " \ "disabled by hub (EMI?), " \ "re-enabling...\n", port + 1); - usb_hub_port_connect_change(dev, port); + connect_change = 1; } } + + if (connect_change) + usb_hub_port_connect_change(dev, port); + if (portstatus & USB_PORT_STAT_SUSPEND) { dev_dbg(&dev->dev, "port %d suspend change\n", port + 1); usb_clear_port_feature(dev, port + 1, |