[Ubuntu PATCH] bluetooth/hci_usb: Fix failures for suspend/resume

[Randy Dunlap <randy.dunlap@oracle.com>]

[UBUNTU:bluetooth] Fix failures for suspend/resume

http://www.kernel.org/git/?p=linux/kernel/git/bcollins/ubuntu-dapper.git;a=commitdiff;h=58db2683478e24009dbae33ea76beafe47b356bb

Plus whitespace cleanups by Randy Dunlap.

Signed-Off-By: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: Ben Collins <bcollins@ubuntu.com>
---
 drivers/bluetooth/hci_usb.c |   57 ++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 57 insertions(+)

--- linux-2617-rc6g7.orig/drivers/bluetooth/hci_usb.c
+++ linux-2617-rc6g7/drivers/bluetooth/hci_usb.c
@@ -1043,9 +1043,66 @@ static void hci_usb_disconnect(struct us
 	hci_free_dev(hdev);
 }
 
+static int hci_usb_suspend(struct usb_interface *intf, pm_message_t message)
+{
+	struct hci_usb *husb = usb_get_intfdata(intf);
+	int i;
+	unsigned long flags;
+	struct list_head killed;
+
+	if (!husb || intf == husb->isoc_iface)
+		return 0;
+
+	INIT_LIST_HEAD(&killed);
+
+	for (i = 0; i < 4; i++) {
+		struct _urb_queue *q = &husb->pending_q[i];
+		struct _urb *_urb, *_tmp;
+		while ((_urb = _urb_dequeue(q))) {
+			/* reset queue since _urb_dequeue sets it to NULL */
+			_urb->queue = q;
+			usb_kill_urb(&_urb->urb);
+			list_add(&_urb->list, &killed);
+		}
+		spin_lock_irqsave(&q->lock, flags);
+		list_for_each_entry_safe(_urb, _tmp, &killed, list) {
+			list_move_tail(&_urb->list, &q->head);
+		}
+		spin_unlock_irqrestore(&q->lock, flags);
+	}
+	return 0;
+}
+
+static int hci_usb_resume(struct usb_interface *intf)
+{
+	struct hci_usb *husb = usb_get_intfdata(intf);
+	int i, err = 0;
+	unsigned long flags;
+
+	if (!husb || intf == husb->isoc_iface)
+		return 0;
+
+	for (i = 0; i < 4; i++) {
+		struct _urb_queue *q = &husb->pending_q[i];
+		struct _urb *_urb;
+		spin_lock_irqsave(&q->lock, flags);
+		list_for_each_entry(_urb, &q->head, list) {
+			err = usb_submit_urb(&_urb->urb, GFP_ATOMIC);
+			if (err)
+				break;
+		}
+		spin_unlock_irqrestore(&q->lock, flags);
+		if (err)
+			return -EIO;
+	}
+	return 0;
+}
+
 static struct usb_driver hci_usb_driver = {
 	.name		= "hci_usb",
 	.probe		= hci_usb_probe,
+	.suspend	= hci_usb_suspend,
+	.resume		= hci_usb_resume,
 	.disconnect	= hci_usb_disconnect,
 	.id_table	= bluetooth_ids,
 };