Staging: Merge staging-next into Linus's tree

[pandora-kernel.git] / drivers / staging / rt2860 / usb_main_dev.c

diff --git a/drivers/staging/rt2860/usb_main_dev.c b/drivers/staging/rt2860/usb_main_dev.c
index 674769d..a0fe31d 100644 (file)
--- a/drivers/staging/rt2860/usb_main_dev.c
+++ b/drivers/staging/rt2860/usb_main_dev.c
@@ -64,6 +64,7 @@ struct usb_device_id rtusb_usb_id[] = {
        {USB_DEVICE(0x14B2, 0x3C07)},   /* AL */
        {USB_DEVICE(0x050D, 0x8053)},   /* Belkin */
        {USB_DEVICE(0x050D, 0x825B)},   /* Belkin */
+       {USB_DEVICE(0x050D, 0x935B)},   /* Belkin F6D4050 v2 */
        {USB_DEVICE(0x14B2, 0x3C23)},   /* Airlink */
        {USB_DEVICE(0x14B2, 0x3C27)},   /* Airlink */
        {USB_DEVICE(0x07AA, 0x002F)},   /* Corega */
@@ -422,8 +423,8 @@ int MlmeThread(IN void *Context)
        int status;
        status = 0;
 
-       pTask = (struct rt_rtmp_os_task *)Context;
-       pAd = (struct rt_rtmp_adapter *)pTask->priv;
+       pTask = Context;
+       pAd = pTask->priv;
 
        RtmpOSTaskCustomize(pTask);
 
@@ -491,8 +492,8 @@ int RTUSBCmdThread(IN void *Context)
        int status;
        status = 0;
 
-       pTask = (struct rt_rtmp_os_task *)Context;
-       pAd = (struct rt_rtmp_adapter *)pTask->priv;
+       pTask = Context;
+       pAd = pTask->priv;
 
        RtmpOSTaskCustomize(pTask);