summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2010-10-28 12:03:41 +1100
committerStephen Rothwell <sfr@canb.auug.org.au>2010-10-28 12:03:41 +1100
commit757d98283b0835fde267c816bdde02557d541106 (patch)
tree5e8a56ee04661f904296c4f66be1ee6a31e009ea /drivers
parent7cf380571a04f79b0b9857370886cefcea36d0c0 (diff)
parenta7d63168232805b514535c6bbe8ebfa159fee2db (diff)
Merge remote branch 'bluetooth/master'
Diffstat (limited to 'drivers')
-rw-r--r--drivers/bluetooth/btusb.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
index d120a5c1c093..b2f288459317 100644
--- a/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
@@ -1029,6 +1029,8 @@ static int btusb_probe(struct usb_interface *intf,
usb_set_intfdata(intf, data);
+ usb_enable_autosuspend(interface_to_usbdev(intf));
+
return 0;
}