---

yaml --- r: 249261 b: refs/heads/master c: 8016a34 h: refs/heads/master i: 249259: 1ef25b2 v: v3
git-mirror · May 3, 2011 · 6096d2b · 6096d2b
1 parent c01a051
commit 6096d2b
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8cfff928a7a8bf946570adce259e80635321e82b
+refs/heads/master: 8016a34d95f281ad6497978a21124236a7eaa6cf
diff --git a/trunk/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c b/trunk/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c
@@ -593,8 +593,6 @@ static void ft1000_reset_asic(struct net_device *dev)
 
 	DEBUG("ft1000_hw:ft1000_reset_asic called\n");
 
-	info->ASICResetNum++;
-
 	/* Let's use the register provided by the Magnemite ASIC to reset the
 	 * ASIC and DSP.
 	 */
@@ -748,7 +746,6 @@ int init_ft1000_netdev(struct ft1000_device *ft1000dev)
 	spin_lock_init(&pInfo->dpram_lock);
 	pInfo->pFt1000Dev = ft1000dev;
 	pInfo->DrvErrNum = 0;
-	pInfo->ASICResetNum = 0;
 	pInfo->registered = 1;
 	pInfo->ft1000_reset = ft1000_reset;
 	pInfo->mediastate = 0;

diff --git a/trunk/drivers/staging/ft1000/ft1000-usb/ft1000_usb.h b/trunk/drivers/staging/ft1000/ft1000-usb/ft1000_usb.h
@@ -496,7 +496,6 @@ struct ft1000_info {
     bool fAppMsgPend;
     u16 DrvErrNum;
     u16 AsicID;
-    int ASICResetNum;
     int DspAsicReset;
     int DSPResetNum;
     int DeviceCreated;