diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-02-20 07:50:32 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-02-20 07:50:32 +0100 |
| commit | f31f40be8f82d5eeb4ca084f9ac0f11ca265876b (patch) | |
| tree | 6fce9ac78045249084d641945e094dcaea72d265 /drivers/usb/core/hub.c | |
| parent | 13c12dbe3a2ce17227f7ddef652b6a53c78fa51f (diff) | |
| parent | 895be5b31e5175bef575008aadb4f0a27b850daa (diff) | |
Merge tag 'asoc-v3.14-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v3.14
A few fixes, all driver speccific ones. The DaVinci ones aren't as
clear as they should be from the subject lines on the commits but they
fix issues which will prevent correct operation in some use cases and
only affect that particular driver so are reasonably safe.
Diffstat (limited to 'drivers/usb/core/hub.c')
| -rw-r--r-- | drivers/usb/core/hub.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c index babba885978d..64ea21971be2 100644 --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c @@ -128,7 +128,7 @@ struct usb_hub *usb_hub_to_struct_hub(struct usb_device *hdev) return usb_get_intfdata(hdev->actconfig->interface[0]); } -int usb_device_supports_lpm(struct usb_device *udev) +static int usb_device_supports_lpm(struct usb_device *udev) { /* USB 2.1 (and greater) devices indicate LPM support through * their USB 2.0 Extended Capabilities BOS descriptor. @@ -149,11 +149,6 @@ int usb_device_supports_lpm(struct usb_device *udev) "Power management will be impacted.\n"); return 0; } - - /* udev is root hub */ - if (!udev->parent) - return 1; - if (udev->parent->lpm_capable) return 1; |