1 files changed, 9 insertions, 3 deletions

diff --git a/drivers/net/wireless/zd1201.c b/drivers/net/wireless/zd1201.c
index 4941f201d6c8..d39c4178c33a 100644
--- a/drivers/net/wireless/zd1201.c
+++ b/drivers/net/wireless/zd1201.c
@@ -75,8 +75,10 @@ static int zd1201_fw_upload(struct usb_device *dev, int apfw)
         len = fw_entry->size;
 
         buf = kmalloc(1024, GFP_ATOMIC);
-        if (!buf)
+        if (!buf) {
+                err = -ENOMEM;
                 goto exit;
+        }
         
         while (len > 0) {
                 int translen = (len > 1024) ? 1024 : len;
@@ -98,10 +100,12 @@ static int zd1201_fw_upload(struct usb_device *dev, int apfw)
                 goto exit;
 
         err = usb_control_msg(dev, usb_rcvctrlpipe(dev, 0), 0x4,
-            USB_DIR_IN | 0x40, 0,0, &ret, sizeof(ret), ZD1201_FW_TIMEOUT);
+            USB_DIR_IN | 0x40, 0, 0, buf, sizeof(ret), ZD1201_FW_TIMEOUT);
         if (err < 0)
                 goto exit;
 
+        memcpy(&ret, buf, sizeof(ret));
+
         if (ret & 0x80) {
                 err = -EIO;
                 goto exit;
@@ -1762,8 +1766,10 @@ static int zd1201_probe(struct usb_interface *interface,
         zd->endp_out2 = 2;
         zd->rx_urb = usb_alloc_urb(0, GFP_KERNEL);
         zd->tx_urb = usb_alloc_urb(0, GFP_KERNEL);
-        if (!zd->rx_urb || !zd->tx_urb)
+        if (!zd->rx_urb || !zd->tx_urb) {
+                err = -ENOMEM;
                 goto err_zd;
+        }
 
         mdelay(100);
         err = zd1201_drvr_start(zd);