From 9c38b98a76a044198e7989291b3b82b61f0dfe14 Mon Sep 17 00:00:00 2001
From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Date: Sun, 16 Aug 2009 21:30:12 +0200
Subject: [PATCH] --- yaml --- r: 162423 b: refs/heads/master c:
 382280ae9d0f94a7ffed1f8963be16b96348684c h: refs/heads/master i:   162421:
 523086000d96c0b6efdb614a561c938e56e63027   162419:
 620a47e9bd25687814b6a81177fa8a23f8e4489a   162415:
 4d298df7e76817455014b7d4325247dc577ef452 v: v3

---
 [refs]                                       | 2 +-
 trunk/drivers/staging/rt2860/rt_linux.h      | 2 +-
 trunk/drivers/staging/rt2870/2870_main_dev.c | 6 +++---
 trunk/drivers/staging/rt2870/rt2870.h        | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 15f064ae4e8c..58825d6c7d78 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c43254c13aebeb7ed1e3534ad77d8dc98dc6475f
+refs/heads/master: 382280ae9d0f94a7ffed1f8963be16b96348684c
diff --git a/trunk/drivers/staging/rt2860/rt_linux.h b/trunk/drivers/staging/rt2860/rt_linux.h
index dbe6fb75d6cb..37b63e24e734 100644
--- a/trunk/drivers/staging/rt2860/rt_linux.h
+++ b/trunk/drivers/staging/rt2860/rt_linux.h
@@ -163,7 +163,7 @@ typedef	struct pid *	THREAD_PID;
 #define	THREAD_PID_INIT_VALUE	NULL
 #define	GET_PID(_v)	find_get_pid(_v)
 #define	GET_PID_NUMBER(_v)	pid_nr(_v)
-#define CHECK_PID_LEGALITY(_pid)	if (pid_nr(_pid) >= 0)
+#define CHECK_PID_LEGALITY(_pid)	if (pid_nr(_pid) > 0)
 #define KILL_THREAD_PID(_A, _B, _C)	kill_pid(_A, _B, _C)
 #endif
 
diff --git a/trunk/drivers/staging/rt2870/2870_main_dev.c b/trunk/drivers/staging/rt2870/2870_main_dev.c
index 9900e8d03045..9b8ec40ea873 100644
--- a/trunk/drivers/staging/rt2870/2870_main_dev.c
+++ b/trunk/drivers/staging/rt2870/2870_main_dev.c
@@ -1063,7 +1063,7 @@ VOID RT28xxThreadTerminate(
 	}
 #endif
 #ifdef RT30xx
-	if (pObj->MLMEThr_pid)
+	if (pid_nr(pObj->MLMEThr_pid) > 0)
 	{
 		printk("Terminate the MLMEThr_pid=%d!\n", pid_nr(pObj->MLMEThr_pid));
 		mb();
@@ -1084,7 +1084,7 @@ VOID RT28xxThreadTerminate(
 		}
 	}
 
-	if (pObj->RTUSBCmdThr_pid >= 0)
+	if (pid_nr(pObj->RTUSBCmdThr_pid) > 0)
 	{
 		printk("Terminate the RTUSBCmdThr_pid=%d!\n", pid_nr(pObj->RTUSBCmdThr_pid));
 		mb();
@@ -1106,7 +1106,7 @@ VOID RT28xxThreadTerminate(
 			pObj->RTUSBCmdThr_pid = NULL;
 		}
 	}
-	if (pObj->TimerQThr_pid >= 0)
+	if (pid_nr(pObj->TimerQThr_pid) > 0)
 	{
 		POS_COOKIE pObj = (POS_COOKIE)pAd->OS_Cookie;
 		printk("Terminate the TimerQThr_pid=%d!\n", pid_nr(pObj->TimerQThr_pid));
diff --git a/trunk/drivers/staging/rt2870/rt2870.h b/trunk/drivers/staging/rt2870/rt2870.h
index 56a6dd0c3e46..f0b1f2f1273e 100644
--- a/trunk/drivers/staging/rt2870/rt2870.h
+++ b/trunk/drivers/staging/rt2870/rt2870.h
@@ -460,14 +460,14 @@ VOID RTUSBBulkRxComplete(purbb_t pUrb, struct pt_regs *pt_regs);
 #define RTUSBMlmeUp(pAd)	        \
 {								    \
 	POS_COOKIE pObj = (POS_COOKIE) pAd->OS_Cookie;	\
-	if(pObj->MLMEThr_pid>0)		    \
+	if (pid_nr(pObj->MLMEThr_pid) > 0) \
         up(&(pAd->mlme_semaphore)); \
 }
 
 #define RTUSBCMDUp(pAd)	                \
 {									    \
 	POS_COOKIE pObj = (POS_COOKIE) pAd->OS_Cookie;	\
-	if(pObj->RTUSBCmdThr_pid>0)		    \
+	if (pid_nr(pObj->RTUSBCmdThr_pid) > 0) \
 	    up(&(pAd->RTUSBCmd_semaphore)); \
 }
 #endif