From bd9dcaa37c0d80ec1b1370dc8092ad8a731ef4a8 Mon Sep 17 00:00:00 2001
From: Vasiliy Kulikov <segooon@gmail.com>
Date: Sun, 3 Oct 2010 21:58:46 +0400
Subject: [PATCH] --- yaml --- r: 220079 b: refs/heads/master c:
 b7378b9ed641b9e39f613d22c762a8ac2a15b8b8 h: refs/heads/master i:   220077:
 c697ca95c35b46694fed7d7f7b48b7ca2ca93019   220075:
 8ca67820003ba911fc8e882a3e0a03a23be8be8d   220071:
 8c9754a16b46a891aa781a66f4168df327b21f71   220063:
 1c8d35ba17a8f55fd5b03b0c898e44131d545dad v: v3

---
 [refs]                                        |  2 +-
 .../staging/ft1000/ft1000-usb/ft1000_hw.c     | 21 +++++++++++++++++--
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index af59c563eb95..a46bb511500b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a285bf995da256be5d96110ec0e7592cb6b2e600
+refs/heads/master: b7378b9ed641b9e39f613d22c762a8ac2a15b8b8
diff --git a/trunk/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c b/trunk/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c
index 44395c0d8821..1f3317c4b1c5 100644
--- a/trunk/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c
+++ b/trunk/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c
@@ -991,6 +991,7 @@ u16 init_ft1000_netdev(struct ft1000_device *ft1000dev)
     FT1000_INFO *pInfo = NULL;
     PDPRAM_BLK pdpram_blk;
     int i;
+	struct list_head *cur, *tmp;
 
 	gCardIndex=0; //mbelian
 
@@ -1026,7 +1027,7 @@ u16 init_ft1000_netdev(struct ft1000_device *ft1000dev)
         }
         else {
             printk(KERN_ERR "ft1000: Invalid device name\n");
-            kfree(netdev);
+	    free_netdev(netdev);
             return STATUS_FAILURE;
         }
     }
@@ -1099,8 +1100,14 @@ u16 init_ft1000_netdev(struct ft1000_device *ft1000dev)
         for (i=0; i<NUM_OF_FREE_BUFFERS; i++) {
             // Get memory for DPRAM_DATA link list
             pdpram_blk = kmalloc ( sizeof(DPRAM_BLK), GFP_KERNEL );
+	    if (pdpram_blk == NULL)
+		goto err_free;
             // Get a block of memory to store command data
             pdpram_blk->pbuffer = kmalloc ( MAX_CMD_SQSIZE, GFP_KERNEL );
+	    if (pdpram_blk->pbuffer == NULL) {
+		kfree(pdpram_blk);
+		goto err_free;
+	    }
             // link provisioning data
             list_add_tail (&pdpram_blk->list, &freercvpool);
         }
@@ -1109,6 +1116,15 @@ u16 init_ft1000_netdev(struct ft1000_device *ft1000dev)
 
     return STATUS_SUCCESS;
 
+
+err_free:
+	list_for_each_safe(cur, tmp, &pdpram_blk->list) {
+		pdpram_blk = list_entry(cur, DPRAM_BLK, list);
+		list_del(&pdpram_blk->list);
+		kfree(pdpram_blk->pbuffer);
+		kfree(pdpram_blk);
+	}
+	return STATUS_FAILURE;
 }
 
 
@@ -1265,7 +1281,8 @@ static int ft1000_read_fifo_reg(struct ft1000_device *ft1000dev,unsigned int pip
 
     if(!urb || !dr)
     {
-        if(urb) kfree(urb);
+	kfree(dr);
+	usb_free_urb(urb);
         spin_unlock(&ft1000dev->device_lock);
         return -ENOMEM;
     }