more patches added

2 files changed, 332 insertions, 0 deletions

diff --git a/usb/usb-ftdi_sio-add-support-for-yost-engineering-servocenter3.1.patch b/usb/usb-ftdi_sio-add-support-for-yost-engineering-servocenter3.1.patch
new file mode 100644
index 0000000000000..5feaa30e1f9fa
--- /dev/null
+++ b/usb/usb-ftdi_sio-add-support-for-yost-engineering-servocenter3.1.patch
@@ -0,0 +1,47 @@
+From ian.abbott@mev.co.uk Tue May 30 04:36:44 2006
+Message-ID: <447C2E3E.4000103@mev.co.uk>
+Date: Tue, 30 May 2006 12:36:30 +0100
+From: Ian Abbott <abbotti@mev.co.uk>
+Cc: Greg KH <greg@kroah.com>, Aaron Prose <aprose@yostengineering.com>
+Subject: USB: ftdi_sio: add support for Yost Engineering ServoCenter3.1
+
+From: Ian Abbott <abbotti@mev.co.uk>
+
+This patch adds support for Yost Engineering Inc's ServoCenter 3.1 USB
+product to the ftdi_sio driver's device ID table.  The PID was supplied
+by Aaron Prose of Yost Engineering on the ftdi-usb-sio-devel list.  The
+PID 0xE050 matches the Windows INF files for this device.
+
+Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/usb/serial/ftdi_sio.c |    1 +
+ drivers/usb/serial/ftdi_sio.h |    6 ++++++
+ 2 files changed, 7 insertions(+)
+
+--- gregkh-2.6.orig/drivers/usb/serial/ftdi_sio.c
++++ gregkh-2.6/drivers/usb/serial/ftdi_sio.c
+@@ -500,6 +500,7 @@ static struct usb_device_id id_table_com
+ 	{ USB_DEVICE(ICOM_ID1_VID, ICOM_ID1_PID) },
+ 	{ USB_DEVICE(PAPOUCH_VID, PAPOUCH_TMU_PID) },
+ 	{ USB_DEVICE(FTDI_VID, FTDI_ACG_HFDUAL_PID) },
++	{ USB_DEVICE(FTDI_VID, FTDI_YEI_SERVOCENTER31_PID) },
+ 	{ },					/* Optional parameter entry */
+ 	{ }					/* Terminating entry */
+ };
+--- gregkh-2.6.orig/drivers/usb/serial/ftdi_sio.h
++++ gregkh-2.6/drivers/usb/serial/ftdi_sio.h
+@@ -436,6 +436,12 @@
+  */
+ #define FTDI_ACG_HFDUAL_PID		0xDD20	/* HF Dual ISO Reader (RFID) */
+ 
++/*
++ * Yost Engineering, Inc. products (www.yostengineering.com).
++ * PID 0xE050 submitted by Aaron Prose.
++ */
++#define FTDI_YEI_SERVOCENTER31_PID	0xE050	/* YEI ServoCenter3.1 USB */
++
+ /* Commands */
+ #define FTDI_SIO_RESET 		0 /* Reset the port */
+ #define FTDI_SIO_MODEM_CTRL 	1 /* Set the modem control register */
diff --git a/usb/usb-zd1201-cleanups.patch b/usb/usb-zd1201-cleanups.patch
new file mode 100644
index 0000000000000..cfd5e653334c6
--- /dev/null
+++ b/usb/usb-zd1201-cleanups.patch
@@ -0,0 +1,285 @@
+From akpm@osdl.org Fri May 26 13:21:00 2006
+Message-Id: <200605262020.k4QKKqkn015536@shell0.pdx.osdl.net>
+Subject: USB: zd1201 cleanups
+From: Pavel Machek <pavel@ucw.cz>
+To: pavel@ucw.cz, greg@kroah.com, pavel@suse.cz, mm-commits@vger.kernel.org
+Date: Fri, 26 May 2006 13:23:46 -0700
+
+From: Pavel Machek <pavel@ucw.cz>
+
+Cleanup coding style and other small stuff in zd1201.  No real code
+changes.
+
+Signed-off-by: Pavel Machek <pavel@suse.cz>
+Signed-off-by: Andrew Morton <akpm@osdl.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/usb/net/zd1201.c |   67 ++++++++++++++++++-----------------------------
+ 1 file changed, 26 insertions(+), 41 deletions(-)
+
+--- gregkh-2.6.orig/drivers/usb/net/zd1201.c
++++ gregkh-2.6/drivers/usb/net/zd1201.c
+@@ -33,7 +33,7 @@ static struct usb_device_id zd1201_table
+ 	{}
+ };
+ 
+-static int ap = 0;	/* Are we an AP or a normal station? */
++static int ap;	/* Are we an AP or a normal station? */
+ 
+ #define ZD1201_VERSION	"0.15"
+ 
+@@ -49,7 +49,7 @@ MODULE_DEVICE_TABLE(usb, zd1201_table);
+ static int zd1201_fw_upload(struct usb_device *dev, int apfw)
+ {
+ 	const struct firmware *fw_entry;
+-	char* data;
++	char *data;
+ 	unsigned long len;
+ 	int err;
+ 	unsigned char ret;
+@@ -65,7 +65,7 @@ static int zd1201_fw_upload(struct usb_d
+ 	if (err) {
+ 		dev_err(&dev->dev, "Failed to load %s firmware file!\n", fwfile);
+ 		dev_err(&dev->dev, "Make sure the hotplug firmware loader is installed.\n");
+-		dev_err(&dev->dev, "Goto http://linux-lc100020.sourceforge.net for more info\n");
++		dev_err(&dev->dev, "Goto http://linux-lc100020.sourceforge.net for more info.\n");
+ 		return err;
+ 	}
+ 
+@@ -94,12 +94,12 @@ static int zd1201_fw_upload(struct usb_d
+ 	    USB_DIR_OUT | 0x40, 0, 0, NULL, 0, ZD1201_FW_TIMEOUT);
+ 	if (err < 0)
+ 		goto exit;
+-                                                                                                                                                                
++
+ 	err = usb_control_msg(dev, usb_rcvctrlpipe(dev, 0), 0x4,
+ 	    USB_DIR_IN | 0x40, 0,0, &ret, sizeof(ret), ZD1201_FW_TIMEOUT);
+ 	if (err < 0)
+ 		goto exit;
+-                                                                                                                                                                                                                                                                                        
++
+ 	if (ret & 0x80) {
+ 		err = -EIO;
+ 		goto exit;
+@@ -166,13 +166,13 @@ static int zd1201_docmd(struct zd1201 *z
+ 		return -ENOMEM;
+ 	}
+ 	usb_fill_bulk_urb(urb, zd->usb, usb_sndbulkpipe(zd->usb, zd->endp_out2),
+-	     command, 16, zd1201_usbfree, zd);
++			  command, 16, zd1201_usbfree, zd);
+ 	ret = usb_submit_urb(urb, GFP_ATOMIC);
+ 	if (ret) {
+ 		kfree(command);
+ 		usb_free_urb(urb);
+ 	}
+-	
++
+ 	return ret;
+ }
+ 
+@@ -316,7 +316,7 @@ static void zd1201_usbrx(struct urb *urb
+ 		fc = le16_to_cpu(*(__le16 *)&data[datalen-16]);
+ 		seq = le16_to_cpu(*(__le16 *)&data[datalen-24]);
+ 
+-		if(zd->monitor) {
++		if (zd->monitor) {
+ 			if (datalen < 24)
+ 				goto resubmit;
+ 			if (!(skb = dev_alloc_skb(datalen+24)))
+@@ -364,7 +364,7 @@ static void zd1201_usbrx(struct urb *urb
+ 				goto resubmit;
+ 			}
+ 			hlist_for_each_entry(frag, node, &zd->fraglist, fnode)
+-				if(frag->seq == (seq&IEEE80211_SCTL_SEQ))
++				if (frag->seq == (seq&IEEE80211_SCTL_SEQ))
+ 					break;
+ 			if (!frag)
+ 				goto resubmit;
+@@ -376,7 +376,6 @@ static void zd1201_usbrx(struct urb *urb
+ 				goto resubmit;
+ 			hlist_del_init(&frag->fnode);
+ 			kfree(frag);
+-			/* Fallthrough */
+ 		} else {
+ 			if (datalen<14)
+ 				goto resubmit;
+@@ -422,7 +421,7 @@ static int zd1201_getconfig(struct zd120
+ 	int rid_fid;
+ 	int length;
+ 	unsigned char *pdata;
+-	
++
+ 	zd->rxdatas = 0;
+ 	err = zd1201_docmd(zd, ZD1201_CMDCODE_ACCESS, rid, 0, 0);
+ 	if (err)
+@@ -471,11 +470,11 @@ static int zd1201_getconfig(struct zd120
+ 	length = zd->rxlen;
+ 
+ 	do {
+-		int  actual_length;
++		int actual_length;
+ 
+ 		actual_length = (length > 64) ? 64 : length;
+ 
+-		if(pdata[0] != 0x3) {
++		if (pdata[0] != 0x3) {
+ 			dev_dbg(&zd->usb->dev, "Rx Resource packet type error: %02X\n",
+ 			    pdata[0]);
+ 			return -EINVAL;
+@@ -487,11 +486,10 @@ static int zd1201_getconfig(struct zd120
+ 		}
+ 
+ 		/* Skip the 4 bytes header (RID length and RID) */
+-		if(i == 0) {
++		if (i == 0) {
+ 			pdata += 8;
+ 			actual_length -= 8;
+-		}
+-		else {
++		} else {
+ 			pdata += 4;
+ 			actual_length -= 4;
+ 		}
+@@ -620,7 +618,7 @@ static int zd1201_drvr_start(struct zd12
+ 	short max;
+ 	__le16 zdmax;
+ 	unsigned char *buffer;
+-	
++
+ 	buffer = kzalloc(ZD1201_RXSIZE, GFP_KERNEL);
+ 	if (!buffer)
+ 		return -ENOMEM;
+@@ -632,7 +630,7 @@ static int zd1201_drvr_start(struct zd12
+ 	err = usb_submit_urb(zd->rx_urb, GFP_KERNEL);
+ 	if (err)
+ 		goto err_buffer;
+-	
++
+ 	err = zd1201_docmd(zd, ZD1201_CMDCODE_INIT, 0, 0, 0);
+ 	if (err)
+ 		goto err_urb;
+@@ -684,7 +682,7 @@ static int zd1201_enable(struct zd1201 *
+ static int zd1201_disable(struct zd1201 *zd)
+ {
+ 	int err;
+-	
++
+ 	if (!zd->mac_enabled)
+ 		return 0;
+ 	if (zd->monitor) {
+@@ -764,7 +762,6 @@ static int zd1201_net_open(struct net_de
+ static int zd1201_net_stop(struct net_device *dev)
+ {
+ 	netif_stop_queue(dev);
+-	
+ 	return 0;
+ }
+ 
+@@ -915,7 +912,6 @@ static int zd1201_get_name(struct net_de
+     struct iw_request_info *info, char *name, char *extra)
+ {
+ 	strcpy(name, "IEEE 802.11b");
+-
+ 	return 0;
+ }
+ 
+@@ -1013,11 +1009,10 @@ static int zd1201_set_mode(struct net_de
+ 			if (err)
+ 				return err;
+ 	}
+-	zd->monitor=monitor;
++	zd->monitor = monitor;
+ 	/* If monitor mode is set we don't actually turn it on here since it
+ 	 * is done during mac reset anyway (see zd1201_mac_enable).
+ 	 */
+-
+ 	zd1201_mac_reset(zd);
+ 
+ 	return 0;
+@@ -1117,7 +1112,7 @@ static int zd1201_get_wap(struct net_dev
+ 		zd->iwstats.qual.updated = 2;
+ 	}
+ 
+-	return zd1201_getconfig(zd,ZD1201_RID_CURRENTBSSID,ap_addr->sa_data,6);
++	return zd1201_getconfig(zd, ZD1201_RID_CURRENTBSSID, ap_addr->sa_data, 6);
+ }
+ 
+ static int zd1201_set_scan(struct net_device *dev,
+@@ -1275,7 +1270,7 @@ static int zd1201_set_rate(struct net_de
+ 	if (!rrq->fixed) { /* Also enable all lower bitrates */
+ 		rate |= rate-1;
+ 	}
+-	
++
+ 	err = zd1201_setconfig16(zd, ZD1201_RID_TXRATECNTL, rate);
+ 	if (err)
+ 		return err;
+@@ -1486,7 +1481,7 @@ static int zd1201_get_encode(struct net_
+ 		return -EINVAL;
+ 
+ 	erq->flags |= i+1;
+-	
++
+ 	erq->length = zd->encode_keylen[i];
+ 	memcpy(key, zd->encode_keys[i], erq->length);
+ 
+@@ -1529,11 +1524,7 @@ static int zd1201_set_power(struct net_d
+ 		return -EINVAL;
+ 	}
+ out:
+-	err = zd1201_setconfig16(zd, ZD1201_RID_CNFPMENABLED, enabled);
+-	if (err)
+-		return err;
+-
+-	return 0;
++	return zd1201_setconfig16(zd, ZD1201_RID_CNFPMENABLED, enabled);
+ }
+ 
+ static int zd1201_get_power(struct net_device *dev,
+@@ -1627,15 +1618,11 @@ static int zd1201_set_hostauth(struct ne
+     struct iw_request_info *info, struct iw_param *rrq, char *extra)
+ {
+ 	struct zd1201 *zd = (struct zd1201 *)dev->priv;
+-	int err;
+ 
+ 	if (!zd->ap)
+ 		return -EOPNOTSUPP;
+ 
+-	err = zd1201_setconfig16(zd, ZD1201_RID_CNFHOSTAUTH, rrq->value);
+-	if (err)
+-		return err;
+-	return 0;
++	return zd1201_setconfig16(zd, ZD1201_RID_CNFHOSTAUTH, rrq->value);
+ }
+ 
+ static int zd1201_get_hostauth(struct net_device *dev,
+@@ -1744,7 +1731,7 @@ static int zd1201_probe(struct usb_inter
+ {
+ 	struct zd1201 *zd;
+ 	struct usb_device *usb;
+-	int i, err;
++	int err;
+ 	short porttype;
+ 	char buf[IW_ESSID_MAX_SIZE+2];
+ 
+@@ -1773,9 +1760,7 @@ static int zd1201_probe(struct usb_inter
+ 	if (!zd->rx_urb || !zd->tx_urb)
+ 		goto err_zd;
+ 
+-	for(i = 0; i<100; i++)
+-		udelay(1000);
+-
++	mdelay(100);
+ 	err = zd1201_drvr_start(zd);
+ 	if (err)
+ 		goto err_zd;
+@@ -1833,7 +1818,7 @@ static int zd1201_probe(struct usb_inter
+ 		goto err_net;
+ 	dev_info(&usb->dev, "%s: ZD1201 USB Wireless interface\n",
+ 	    zd->dev->name);
+-	
++
+ 	usb_set_intfdata(interface, zd);
+ 	return 0;
+