Merge branch 'omap-pool'

[linux-2.6-omap-h63xx.git] / drivers / staging / rt2870 / rt2870.h

diff --git a/drivers/staging/rt2870/rt2870.h b/drivers/staging/rt2870/rt2870.h
index 30af4b57c3d81788216bd352e938bba9ff21fae1..5dd15aac9ce7cad94f20b511ce1941aec2f1dd9f 100644 (file)
--- a/drivers/staging/rt2870/rt2870.h
+++ b/drivers/staging/rt2870/rt2870.h
@@ -86,6 +86,7 @@
 #define RT2870_USB_DEVICES     \
 {      \
        {USB_DEVICE(0x148F,0x2770)}, /* Ralink */               \
+       {USB_DEVICE(0x1737,0x0071)}, /* Linksys WUSB600N */     \
        {USB_DEVICE(0x148F,0x2870)}, /* Ralink */               \
        {USB_DEVICE(0x148F,0x3070)}, /* Ralink */               \
        {USB_DEVICE(0x0B05,0x1731)}, /* Asus */                 \
@@ -576,14 +577,16 @@ VOID RTUSBBulkRxComplete(purbb_t pUrb, struct pt_regs *pt_regs);
 #define RTUSBMlmeUp(pAd)               \
 {                                                                  \
        POS_COOKIE pObj = (POS_COOKIE) pAd->OS_Cookie;  \
-       CHECK_PID_LEGALITY(pObj->MLMEThr_pid)               \
+       BUG_ON(pObj->MLMEThr_task == NULL);                 \
+       CHECK_PID_LEGALITY(task_pid(pObj->MLMEThr_task))                    \
         up(&(pAd->mlme_semaphore)); \
 }
 
 #define RTUSBCMDUp(pAd)                        \
 {                                                                          \
        POS_COOKIE pObj = (POS_COOKIE) pAd->OS_Cookie;  \
-       CHECK_PID_LEGALITY(pObj->RTUSBCmdThr_pid)           \
+       BUG_ON(pObj->RTUSBCmdThr_task == NULL);     \
+       CHECK_PID_LEGALITY(task_pid(pObj->RTUSBCmdThr_task))        \
            up(&(pAd->RTUSBCmd_semaphore)); \
 }