Merge tag 'usb-4.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb

[cascardo/linux.git] / drivers / staging / rtl8192e / rtllib_softmac_wx.c

diff --git a/drivers/staging/rtl8192e/rtllib_softmac_wx.c b/drivers/staging/rtl8192e/rtllib_softmac_wx.c
index 86f52ac..61ed8b0 100644 (file)
--- a/drivers/staging/rtl8192e/rtllib_softmac_wx.c
+++ b/drivers/staging/rtl8192e/rtllib_softmac_wx.c
@@ -243,7 +243,7 @@ int rtllib_wx_get_rate(struct rtllib_device *ieee,
                             struct iw_request_info *info,
                             union iwreq_data *wrqu, char *extra)
 {
-       u32 tmp_rate = 0;
+       u32 tmp_rate;
 
        tmp_rate = TxCountToDataRate(ieee,
                                     ieee->softmac_stats.CurrentShowTxate);
@@ -429,7 +429,7 @@ int rtllib_wx_set_scan(struct rtllib_device *ieee, struct iw_request_info *a,
        }
 
        if (ieee->state == RTLLIB_LINKED) {
-               queue_work_rsl(ieee->wq, &ieee->wx_sync_scan_wq);
+               schedule_work(&ieee->wx_sync_scan_wq);
                /* intentionally forget to up sem */
                return 0;
        }