ALSA: usb-audio: add support for Akai MPD16

[safe/jmp/linux-2.6] / drivers / staging / rt2860 / sta_ioctl.c

diff --git a/drivers/staging/rt2860/sta_ioctl.c b/drivers/staging/rt2860/sta_ioctl.c
index 04f81bd..de4b627 100644 (file)
--- a/drivers/staging/rt2860/sta_ioctl.c
+++ b/drivers/staging/rt2860/sta_ioctl.c
@@ -600,7 +600,7 @@ int rt_ioctl_siwap(struct net_device *dev,
        if (pAdapter->Mlme.CntlMachine.CurrState != CNTL_IDLE) {
                RTMP_MLME_RESET_STATE_MACHINE(pAdapter);
                DBGPRINT(RT_DEBUG_TRACE,
-                        ("!!! MLME busy, reset MLME state machine !!!\n"));
+                        ("MLME busy, reset MLME state machine!\n"));
        }
        /* tell CNTL state machine to call NdisMSetInformationComplete() after completing */
        /* this request, because this request is initiated by NDIS. */
@@ -741,7 +741,7 @@ int rt_ioctl_siwscan(struct net_device *dev,
 
        if (MONITOR_ON(pAdapter)) {
                DBGPRINT(RT_DEBUG_TRACE,
-                        ("!!! Driver is in Monitor Mode now !!!\n"));
+                        ("Driver is in Monitor Mode now!\n"));
                return -EINVAL;
        }
 
@@ -758,7 +758,7 @@ int rt_ioctl_siwscan(struct net_device *dev,
                if ((pAdapter->StaCfg.WpaSupplicantUP == WPA_SUPPLICANT_ENABLE)
                    && (pAdapter->StaCfg.WpaSupplicantScanCount > 3)) {
                        DBGPRINT(RT_DEBUG_TRACE,
-                                ("!!! WpaSupplicantScanCount > 3\n"));
+                                ("WpaSupplicantScanCount > 3\n"));
                        Status = NDIS_STATUS_SUCCESS;
                        break;
                }
@@ -771,7 +771,7 @@ int rt_ioctl_siwscan(struct net_device *dev,
                    && (pAdapter->StaCfg.PortSecured ==
                        WPA_802_1X_PORT_NOT_SECURED)) {
                        DBGPRINT(RT_DEBUG_TRACE,
-                                ("!!! Link UP, Port Not Secured! ignore this set::OID_802_11_BSSID_LIST_SCAN\n"));
+                                ("Link UP, Port Not Secured! ignore this set::OID_802_11_BSSID_LIST_SCAN\n"));
                        Status = NDIS_STATUS_SUCCESS;
                        break;
                }
@@ -779,7 +779,7 @@ int rt_ioctl_siwscan(struct net_device *dev,
                if (pAdapter->Mlme.CntlMachine.CurrState != CNTL_IDLE) {
                        RTMP_MLME_RESET_STATE_MACHINE(pAdapter);
                        DBGPRINT(RT_DEBUG_TRACE,
-                                ("!!! MLME busy, reset MLME state machine !!!\n"));
+                                ("MLME busy, reset MLME state machine!\n"));
                }
                /* tell CNTL state machine to call NdisMSetInformationComplete() after completing */
                /* this request, because this request is initiated by NDIS. */
@@ -975,10 +975,7 @@ int rt_ioctl_giwscan(struct net_device *dev,
                /*================================ */
                memset(&iwe, 0, sizeof(iwe));
                iwe.cmd = SIOCGIWFREQ;
-               if (INFRA_ON(pAdapter) || ADHOC_ON(pAdapter))
-                       iwe.u.freq.m = pAdapter->ScanTab.BssEntry[i].Channel;
-               else
-                       iwe.u.freq.m = pAdapter->ScanTab.BssEntry[i].Channel;
+               iwe.u.freq.m = pAdapter->ScanTab.BssEntry[i].Channel;
                iwe.u.freq.e = 0;
                iwe.u.freq.i = 0;
 
@@ -2256,7 +2253,7 @@ int rt_ioctl_siwpmksa(struct net_device *dev,
                break;
        default:
                DBGPRINT(RT_DEBUG_TRACE,
-                        ("rt_ioctl_siwpmksa - Unknow Command!!\n"));
+                        ("rt_ioctl_siwpmksa - Unknown Command!\n"));
                break;
        }
 
@@ -2664,7 +2661,7 @@ int Set_SSID_Proc(struct rt_rtmp_adapter *pAdapter, char *arg)
                if (pAdapter->Mlme.CntlMachine.CurrState != CNTL_IDLE) {
                        RTMP_MLME_RESET_STATE_MACHINE(pAdapter);
                        DBGPRINT(RT_DEBUG_TRACE,
-                                ("!!! MLME busy, reset MLME state machine !!!\n"));
+                                ("MLME busy, reset MLME state machine!\n"));
                }
 
                if ((pAdapter->StaCfg.WpaPassPhraseLen >= 8) &&