diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-08-07 19:06:13 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-08-07 19:06:13 -0700 |
| commit | 710ad849ae76bc2f938a885e928b90cdbbe61a6e (patch) | |
| tree | 28d53ccd6cf3888453fb7e588f5c62edcc595f69 /drivers/staging/rt2870/common/rtusb_io.c | |
| parent | b32b8e645ea764620ececc0c9a66a7fc08536d4d (diff) | |
| parent | 749d00dbf154fc2f9ac59df669205039de0d5b45 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6:
Staging: rspiusb: Fix buffer overflow
staging: add dependencies on PCI for drivers that require it
Staging: rtl8192su: fix build error
Staging: rt2870: Revert d44ca7 Removal of kernel_thread() API
Staging: rt2870: Add USB ID for Linksys, Planex Communications, Belkin
Diffstat (limited to 'drivers/staging/rt2870/common/rtusb_io.c')
| -rw-r--r-- | drivers/staging/rt2870/common/rtusb_io.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/staging/rt2870/common/rtusb_io.c b/drivers/staging/rt2870/common/rtusb_io.c index fd1b0c18f2a..704b5c2d509 100644 --- a/drivers/staging/rt2870/common/rtusb_io.c +++ b/drivers/staging/rt2870/common/rtusb_io.c @@ -984,8 +984,7 @@ NDIS_STATUS RTUSBEnqueueCmdFromNdis( POS_COOKIE pObj = (POS_COOKIE) pAd->OS_Cookie; #ifndef RT30xx - BUG_ON(pObj->RTUSBCmdThr_task == NULL); - CHECK_PID_LEGALITY(task_pid(pObj->RTUSBCmdThr_task)) + CHECK_PID_LEGALITY(pObj->RTUSBCmdThr_pid) #endif #ifdef RT30xx if (pObj->RTUSBCmdThr_pid < 0) |