Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f06b9f3c authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'for-usb-next-2012-05-18' of... 

Merge tag 'for-usb-next-2012-05-18' of git://git.kernel.org/pub/scm/linux/kernel/git/sarah/xhci into usb-next

xhci: Link PM and bug fixes for 3.5.

Hi Greg,

Here's the final Link Power Management patches, along with a couple of bug
fixes that have been sitting in my queue.  I've fixed all the comments that
Alan and Andiry had on the Link PM patches, so I think they're ready to go.

Sarah Sharp
parents 7cbb062a e1f12eb6

drivers/bluetooth/ath3k.c

+1 −0
Original line number Diff line number Diff line
@@ -439,6 +439,7 @@ static struct usb_driver ath3k_driver = { 
	.probe		= ath3k_probe,

	.disconnect	= ath3k_disconnect,

	.id_table	= ath3k_table,

	.disable_hub_initiated_lpm = 1,

};



module_usb_driver(ath3k_driver);

drivers/bluetooth/bcm203x.c

+1 −0
Original line number Diff line number Diff line
@@ -279,6 +279,7 @@ static struct usb_driver bcm203x_driver = { 
	.probe		= bcm203x_probe,

	.disconnect	= bcm203x_disconnect,

	.id_table	= bcm203x_table,

	.disable_hub_initiated_lpm = 1,

};



module_usb_driver(bcm203x_driver);

drivers/bluetooth/bfusb.c

+1 −0
Original line number Diff line number Diff line
@@ -749,6 +749,7 @@ static struct usb_driver bfusb_driver = { 
	.probe		= bfusb_probe,

	.disconnect	= bfusb_disconnect,

	.id_table	= bfusb_table,

	.disable_hub_initiated_lpm = 1,

};



module_usb_driver(bfusb_driver);

drivers/bluetooth/bpa10x.c

+1 −0
Original line number Diff line number Diff line
@@ -508,6 +508,7 @@ static struct usb_driver bpa10x_driver = { 
	.probe		= bpa10x_probe,

	.disconnect	= bpa10x_disconnect,

	.id_table	= bpa10x_table,

	.disable_hub_initiated_lpm = 1,

};



module_usb_driver(bpa10x_driver);

drivers/bluetooth/btusb.c

+1 −0
Original line number Diff line number Diff line
@@ -1218,6 +1218,7 @@ static struct usb_driver btusb_driver = { 
#endif

	.id_table	= btusb_table,

	.supports_autosuspend = 1,

	.disable_hub_initiated_lpm = 1,

};



module_usb_driver(btusb_driver);