Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

[GitHub/exynos8895/android_kernel_samsung_universal8895.git] / drivers / staging / vt6655 / wpactl.c

diff --git a/drivers/staging/vt6655/wpactl.c b/drivers/staging/vt6655/wpactl.c
index 0814bfd68b2e726067a53588a1bd558f78951afe..5f454ca2a3bcbe5f15c47dee87aa5c05384dd87c 100644 (file)
--- a/drivers/staging/vt6655/wpactl.c
+++ b/drivers/staging/vt6655/wpactl.c
@@ -557,7 +557,7 @@ static int wpa_get_scan(PSDevice pDevice,
        ptempBSS = kmalloc(sizeof(KnownBSS), GFP_ATOMIC);
 
        if (ptempBSS == NULL) {
-               printk(KERN_ERR "bubble sort kmalloc memory fail@@@\n");
+               pr_err("bubble sort kmalloc memory fail@@@\n");
 
                ret = -ENOMEM;
 
@@ -767,6 +767,7 @@ static int wpa_set_associate(PSDevice pDevice,
 /*******search if ap_scan=2 ,which is associating request in hidden ssid mode ****/
        {
                PKnownBSS       pCurr = NULL;
+
                pCurr = BSSpSearchBSSList(pDevice,
                                          pMgmt->abyDesireBSSID,
                                          pMgmt->abyDesireSSID,
@@ -774,7 +775,7 @@ static int wpa_set_associate(PSDevice pDevice,
 );
 
                if (pCurr == NULL) {
-                       printk("wpa_set_associate---->hidden mode site survey before associate.......\n");
+                       pr_debug("wpa_set_associate---->hidden mode site survey before associate.......\n");
                        bScheduleCommand((void *)pDevice, WLAN_CMD_BSSID_SCAN, pMgmt->abyDesireSSID);
                }
        }