diff options
| author | Felix Blyakher <felixb@sgi.com> | 2009-02-03 10:51:52 -0500 |
|---|---|---|
| committer | Felix Blyakher <felixb@sgi.com> | 2009-02-03 10:51:52 -0500 |
| commit | ed7b44af3517441ba46b84da13773d24809ffdd3 (patch) | |
| tree | 7064703c5d63d44700085cd701703457730bc06e /drivers/usb/wusbcore/devconnect.c | |
| parent | a1a1415e5ea2d2241df208a7777a4f38aba9ed5a (diff) | |
| parent | b1792e367053968f2ddb48bc911d314143ce6242 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/usb/wusbcore/devconnect.c')
| -rw-r--r-- | drivers/usb/wusbcore/devconnect.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/usb/wusbcore/devconnect.c b/drivers/usb/wusbcore/devconnect.c index e2e7e4bc846..8e18141bb2e 100644 --- a/drivers/usb/wusbcore/devconnect.c +++ b/drivers/usb/wusbcore/devconnect.c | |||
| @@ -386,6 +386,7 @@ static void __wusbhc_dev_disconnect(struct wusbhc *wusbhc, | |||
| 386 | | USB_PORT_STAT_LOW_SPEED | USB_PORT_STAT_HIGH_SPEED); | 386 | | USB_PORT_STAT_LOW_SPEED | USB_PORT_STAT_HIGH_SPEED); |
| 387 | port->change |= USB_PORT_STAT_C_CONNECTION | USB_PORT_STAT_C_ENABLE; | 387 | port->change |= USB_PORT_STAT_C_CONNECTION | USB_PORT_STAT_C_ENABLE; |
| 388 | if (wusb_dev) { | 388 | if (wusb_dev) { |
| 389 | dev_dbg(wusbhc->dev, "disconnecting device from port %d\n", wusb_dev->port_idx); | ||
| 389 | if (!list_empty(&wusb_dev->cack_node)) | 390 | if (!list_empty(&wusb_dev->cack_node)) |
| 390 | list_del_init(&wusb_dev->cack_node); | 391 | list_del_init(&wusb_dev->cack_node); |
| 391 | /* For the one in cack_add() */ | 392 | /* For the one in cack_add() */ |