Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (36 commits)
  USB: Driver for Freescale QUICC Engine USB Host Controller
  USB: option: add QUANTA HSDPA Data Card device ids
  USB: storage: Add another unusual_dev for off-by-one bug
  USB: unusual_dev: usb-storage needs to ignore a device
  USB: GADGET: fix !x & y
  USB: new id for ti_usb_3410_5052 driver
  USB: cdc-acm: Add another conexant modem to the quirks
  USB: 'option' driver - onda device MT503HS has wrong id
  USB: Remove ZTE modem from unusual_devices
  USB: storage: support of Dane-Elec MediaTouch USB device
  USB: usbmon: Implement compat_ioctl
  USB: add kernel-doc for wusb_dev in struct usb_device
  USB: ftdi_sio driver support of bar code scanner from Diebold
  USB: ftdi_sio: added Alti-2 VID and Neptune 3 PID
  USB: cp2101 device
  USB: usblp.c: add USBLP_QUIRK_BIDIR to Brother HL-1440
  USB: remove vernier labpro from ldusb
  USB: CDC-ACM quirk for MTK GPS
  USB: cdc-acm: support some gps data loggers
  USB: composite: Fix bug: low byte of w_index is the usb interface number not the whole 2 bytes of w_index
  ...

1 files changed, 113 insertions, 0 deletions

diff --git a/drivers/usb/host/fhci-mem.c b/drivers/usb/host/fhci-mem.c
new file mode 100644
index 000000000000..2c0736c99712
--- /dev/null
+++ b/drivers/usb/host/fhci-mem.c
@@ -0,0 +1,113 @@
+/*
+ * Freescale QUICC Engine USB Host Controller Driver
+ *
+ * Copyright (c) Freescale Semicondutor, Inc. 2006.
+ *               Shlomi Gridish <gridish@freescale.com>
+ *               Jerry Huang <Chang-Ming.Huang@freescale.com>
+ * Copyright (c) Logic Product Development, Inc. 2007
+ *               Peter Barada <peterb@logicpd.com>
+ * Copyright (c) MontaVista Software, Inc. 2008.
+ *               Anton Vorontsov <avorontsov@ru.mvista.com>
+ *
+ * This program is free software; you can redistribute  it and/or modify it
+ * under  the terms of  the GNU General  Public License as published by the
+ * Free Software Foundation;  either version 2 of the  License, or (at your
+ * option) any later version.
+ */
+
+#include <linux/kernel.h>
+#include <linux/types.h>
+#include <linux/delay.h>
+#include <linux/list.h>
+#include <linux/usb.h>
+#include "../core/hcd.h"
+#include "fhci.h"
+
+static void init_td(struct td *td)
+{
+        memset(td, 0, sizeof(*td));
+        INIT_LIST_HEAD(&td->node);
+        INIT_LIST_HEAD(&td->frame_lh);
+}
+
+static void init_ed(struct ed *ed)
+{
+        memset(ed, 0, sizeof(*ed));
+        INIT_LIST_HEAD(&ed->td_list);
+        INIT_LIST_HEAD(&ed->node);
+}
+
+static struct td *get_empty_td(struct fhci_hcd *fhci)
+{
+        struct td *td;
+
+        if (!list_empty(&fhci->empty_tds)) {
+                td = list_entry(fhci->empty_tds.next, struct td, node);
+                list_del(fhci->empty_tds.next);
+        } else {
+                td = kmalloc(sizeof(*td), GFP_ATOMIC);
+                if (!td)
+                        fhci_err(fhci, "No memory to allocate to TD\n");
+                else
+                        init_td(td);
+        }
+
+        return td;
+}
+
+void fhci_recycle_empty_td(struct fhci_hcd *fhci, struct td *td)
+{
+        init_td(td);
+        list_add(&td->node, &fhci->empty_tds);
+}
+
+struct ed *fhci_get_empty_ed(struct fhci_hcd *fhci)
+{
+        struct ed *ed;
+
+        if (!list_empty(&fhci->empty_eds)) {
+                ed = list_entry(fhci->empty_eds.next, struct ed, node);
+                list_del(fhci->empty_eds.next);
+        } else {
+                ed = kmalloc(sizeof(*ed), GFP_ATOMIC);
+                if (!ed)
+                        fhci_err(fhci, "No memory to allocate to ED\n");
+                else
+                        init_ed(ed);
+        }
+
+        return ed;
+}
+
+void fhci_recycle_empty_ed(struct fhci_hcd *fhci, struct ed *ed)
+{
+        init_ed(ed);
+        list_add(&ed->node, &fhci->empty_eds);
+}
+
+struct td *fhci_td_fill(struct fhci_hcd *fhci, struct urb *urb,
+                        struct urb_priv *urb_priv, struct ed *ed, u16 index,
+                        enum fhci_ta_type type, int toggle, u8 *data, u32 len,
+                        u16 interval, u16 start_frame, bool ioc)
+{
+        struct td *td = get_empty_td(fhci);
+
+        if (!td)
+                return NULL;
+
+        td->urb = urb;
+        td->ed = ed;
+        td->type = type;
+        td->toggle = toggle;
+        td->data = data;
+        td->len = len;
+        td->iso_index = index;
+        td->interval = interval;
+        td->start_frame = start_frame;
+        td->ioc = ioc;
+        td->status = USB_TD_OK;
+
+        urb_priv->tds[index] = td;
+
+        return td;
+}