From 9f14cf19f071d70f0e9762e4d77f15aa010a2b62 Mon Sep 17 00:00:00 2001
From: Pekka Enberg <penberg@kernel.org>
Date: Mon, 1 Nov 2010 22:29:30 +0200
Subject: [PATCH] --- yaml --- r: 228017 b: refs/heads/master c:
 87cb9a6310bc5183de196b25ef6adfda3080a744 h: refs/heads/master i:   228015:
 633927ca29f3c87ff6f4a60a067cab19c3f58410 v: v3

---
 [refs]                                 | 2 +-
 trunk/drivers/staging/winbond/wb35rx.c | 4 ++--
 trunk/drivers/staging/winbond/wb35tx.c | 8 ++++----
 trunk/drivers/staging/winbond/wbhal.h  | 3 ---
 4 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index 76ac52547f12..5bbee058925a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4d0d302257d3d0eccf371aab49c74b41797bebc3
+refs/heads/master: 87cb9a6310bc5183de196b25ef6adfda3080a744
diff --git a/trunk/drivers/staging/winbond/wb35rx.c b/trunk/drivers/staging/winbond/wb35rx.c
index 448514aada44..5af271f2de9c 100644
--- a/trunk/drivers/staging/winbond/wb35rx.c
+++ b/trunk/drivers/staging/winbond/wb35rx.c
@@ -174,7 +174,7 @@ static void Wb35Rx_Complete(struct urb *urb)
 	/* The IRP is completed */
 	pWb35Rx->EP3vm_state = VM_COMPLETED;
 
-	if (pHwData->SurpriseRemove || pHwData->HwStop) /* Must be here, or RxBufferId is invalid */
+	if (pHwData->SurpriseRemove) /* Must be here, or RxBufferId is invalid */
 		goto error;
 
 	if (pWb35Rx->rx_halt)
@@ -239,7 +239,7 @@ static void Wb35Rx(struct ieee80211_hw *hw)
 	u32			RxBufferId;
 
 	/* Issuing URB */
-	if (pHwData->SurpriseRemove || pHwData->HwStop)
+	if (pHwData->SurpriseRemove)
 		goto error;
 
 	if (pWb35Rx->rx_halt)
diff --git a/trunk/drivers/staging/winbond/wb35tx.c b/trunk/drivers/staging/winbond/wb35tx.c
index 2a9d05557678..fd52554e46f8 100644
--- a/trunk/drivers/staging/winbond/wb35tx.c
+++ b/trunk/drivers/staging/winbond/wb35tx.c
@@ -41,7 +41,7 @@ static void Wb35Tx_complete(struct urb * pUrb)
 	pWb35Tx->TxSendIndex++;
 	pWb35Tx->TxSendIndex %= MAX_USB_TX_BUFFER_NUMBER;
 
-	if (pHwData->SurpriseRemove || pHwData->HwStop) // Let WbWlanHalt to handle surprise remove
+	if (pHwData->SurpriseRemove) // Let WbWlanHalt to handle surprise remove
 		goto error;
 
 	if (pWb35Tx->tx_halt)
@@ -74,7 +74,7 @@ static void Wb35Tx(struct wbsoft_priv *adapter)
 	u32		SendIndex;
 
 
-	if (pHwData->SurpriseRemove || pHwData->HwStop)
+	if (pHwData->SurpriseRemove)
 		goto cleanup;
 
 	if (pWb35Tx->tx_halt)
@@ -222,7 +222,7 @@ static void Wb35Tx_EP2VM_complete(struct urb * pUrb)
 	pWb35Tx->EP2VM_status = pUrb->status;
 
 	// For Linux 2.4. Interrupt will always trigger
-	if (pHwData->SurpriseRemove || pHwData->HwStop) // Let WbWlanHalt to handle surprise remove
+	if (pHwData->SurpriseRemove) // Let WbWlanHalt to handle surprise remove
 		goto error;
 
 	if (pWb35Tx->tx_halt)
@@ -263,7 +263,7 @@ static void Wb35Tx_EP2VM(struct wbsoft_priv *adapter)
 	u32 *	pltmp = (u32 *)pWb35Tx->EP2_buf;
 	int		retv;
 
-	if (pHwData->SurpriseRemove || pHwData->HwStop)
+	if (pHwData->SurpriseRemove)
 		goto error;
 
 	if (pWb35Tx->tx_halt)
diff --git a/trunk/drivers/staging/winbond/wbhal.h b/trunk/drivers/staging/winbond/wbhal.h
index 6f4cd76e7be2..1c91588fc5b3 100644
--- a/trunk/drivers/staging/winbond/wbhal.h
+++ b/trunk/drivers/staging/winbond/wbhal.h
@@ -511,9 +511,6 @@ struct hw_data {
 
 	/* For global timer */
 	u32		time_count;	/* TICK_TIME_100ms 1 = 100ms */
-
-	/* For error recover */
-	u32		HwStop;
 };
 
 #endif