1 files changed, 5 insertions, 3 deletions

diff --git a/drivers/net/wireless/zd1201.c b/drivers/net/wireless/zd1201.c
index 662ecc8a33ff..80af9a9fcbb3 100644
--- a/drivers/net/wireless/zd1201.c
+++ b/drivers/net/wireless/zd1201.c
@@ -119,7 +119,7 @@ static void zd1201_usbfree(struct urb *urb, struct pt_regs *regs)
         switch(urb->status) {
                 case -EILSEQ:
                 case -ENODEV:
-                case -ETIMEDOUT:
+                case -ETIME:
                 case -ENOENT:
                 case -EPIPE:
                 case -EOVERFLOW:
@@ -201,7 +201,7 @@ static void zd1201_usbrx(struct urb *urb, struct pt_regs *regs)
         switch(urb->status) {
                 case -EILSEQ:
                 case -ENODEV:
-                case -ETIMEDOUT:
+                case -ETIME:
                 case -ENOENT:
                 case -EPIPE:
                 case -EOVERFLOW:
@@ -1218,7 +1218,7 @@ static int zd1201_set_essid(struct net_device *dev,
                 return -EINVAL;
         if (data->length < 1)
                 data->length = 1;
-        zd->essidlen = data->length-1;
+        zd->essidlen = data->length;
         memset(zd->essid, 0, IW_ESSID_MAX_SIZE+1);
         memcpy(zd->essid, essid, data->length);
         return zd1201_join(zd, zd->essid, zd->essidlen);
@@ -1820,6 +1820,8 @@ static int zd1201_probe(struct usb_interface *interface,
             zd->dev->name);
 
         usb_set_intfdata(interface, zd);
+        zd1201_enable(zd);      /* zd1201 likes to startup enabled, */
+        zd1201_disable(zd);     /* interfering with all the wifis in range */
         return 0;
 
 err_net: