diff options
| author | David S. Miller <davem@davemloft.net> | 2010-02-28 22:23:06 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-02-28 22:23:06 -0500 |
| commit | 47871889c601d8199c51a4086f77eebd77c29b0b (patch) | |
| tree | 40cdcac3bff0ee40cc33dcca61d0577cdf965f77 /drivers/usb/core/hub.c | |
| parent | c16cc0b464b8876cfd57ce1c1dbcb6f9a6a0bce3 (diff) | |
| parent | 30ff056c42c665b9ea535d8515890857ae382540 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Conflicts:
drivers/firmware/iscsi_ibft.c
Diffstat (limited to 'drivers/usb/core/hub.c')
| -rw-r--r-- | drivers/usb/core/hub.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c index 35cc8b9ba1f5..20ecb4cec8de 100644 --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c | |||
| @@ -1817,6 +1817,7 @@ int usb_new_device(struct usb_device *udev) | |||
| 1817 | /* Tell the world! */ | 1817 | /* Tell the world! */ |
| 1818 | announce_device(udev); | 1818 | announce_device(udev); |
| 1819 | 1819 | ||
| 1820 | device_enable_async_suspend(&udev->dev); | ||
| 1820 | /* Register the device. The device driver is responsible | 1821 | /* Register the device. The device driver is responsible |
| 1821 | * for configuring the device and invoking the add-device | 1822 | * for configuring the device and invoking the add-device |
| 1822 | * notifier chain (used by usbfs and possibly others). | 1823 | * notifier chain (used by usbfs and possibly others). |