diff options
Diffstat (limited to 'drivers/net/wireless')
| -rw-r--r-- | drivers/net/wireless/ath/wcn36xx/main.c | 4 | ||||
| -rw-r--r-- | drivers/net/wireless/ath/wcn36xx/wcn36xx.h | 6 | ||||
| -rw-r--r-- | drivers/net/wireless/wcnss/wcnss_wlan.c | 13 |
3 files changed, 18 insertions, 5 deletions
diff --git a/drivers/net/wireless/ath/wcn36xx/main.c b/drivers/net/wireless/ath/wcn36xx/main.c index 145b8e593a4e..d13036952441 100644 --- a/drivers/net/wireless/ath/wcn36xx/main.c +++ b/drivers/net/wireless/ath/wcn36xx/main.c @@ -265,7 +265,7 @@ static int wcn36xx_start(struct ieee80211_hw *hw) ret = -ENOMEM; goto out_free_dxe_ctl; } - +#if 0 ret = wcn36xx_smd_load_nv(wcn); if (ret) { wcn36xx_err("Failed to push NV to chip\n"); @@ -285,7 +285,7 @@ static int wcn36xx_start(struct ieee80211_hw *hw) else wcn36xx_feat_caps_info(wcn); } - +#endif wcn36xx_detect_chip_version(wcn); /* DMA channel initialization */ diff --git a/drivers/net/wireless/ath/wcn36xx/wcn36xx.h b/drivers/net/wireless/ath/wcn36xx/wcn36xx.h index f0fb81dfd17b..deb0c66ec677 100644 --- a/drivers/net/wireless/ath/wcn36xx/wcn36xx.h +++ b/drivers/net/wireless/ath/wcn36xx/wcn36xx.h @@ -74,6 +74,12 @@ enum wcn36xx_debug_mask { buf, len, false); \ } while (0) +#define wcn36xx_dump(mask, prefix_str, buf, len) do { \ + print_hex_dump(KERN_INFO, pr_fmt(prefix_str), \ + DUMP_PREFIX_OFFSET, 32, 1, \ + buf, len, false); \ +} while (0) + #define WCN36XX_HW_CHANNEL(__wcn) (__wcn->hw->conf.chandef.chan->hw_value) #define WCN36XX_BAND(__wcn) (__wcn->hw->conf.chandef.chan->band) #define WCN36XX_CENTER_FREQ(__wcn) (__wcn->hw->conf.chandef.chan->center_freq) diff --git a/drivers/net/wireless/wcnss/wcnss_wlan.c b/drivers/net/wireless/wcnss/wcnss_wlan.c index a3487c2dc49a..a6067a26977d 100644 --- a/drivers/net/wireless/wcnss/wcnss_wlan.c +++ b/drivers/net/wireless/wcnss/wcnss_wlan.c @@ -2331,6 +2331,9 @@ static ssize_t wcnss_ctrl_write(struct file *fp, const char __user || WCNSS_MIN_CMD_LEN > count) return -EFAULT; + if (!count) + return 0; + mutex_lock(&penv->ctrl_lock); rc = copy_from_user(buf, user_buffer, count); if (0 == rc) @@ -2798,8 +2801,10 @@ static ssize_t wcnss_wlan_write(struct file *fp, const char __user int rc = 0; u32 size = 0; - if (!penv || !penv->device_opened || penv->user_cal_available) + if (!penv || !penv->device_opened || penv->user_cal_available) { + pr_err("ai %p %d %d,,, writing %d\n", penv, penv->device_opened, penv->user_cal_available, count); return -EFAULT; + } if (penv->user_cal_rcvd == 0 && count >= 4 && !penv->user_cal_data) { @@ -2820,8 +2825,10 @@ static ssize_t wcnss_wlan_write(struct file *fp, const char __user if (0 == count) goto exit; - } else if (penv->user_cal_rcvd == 0 && count < 4) + } else if (penv->user_cal_rcvd == 0 && count < 4) { + pr_err("b\n"); return -EFAULT; + } if ((UINT32_MAX - count < penv->user_cal_rcvd) || MAX_CALIBRATED_DATA_SIZE < count + penv->user_cal_rcvd) { @@ -2899,7 +2906,7 @@ static const struct file_operations wcnss_node_fops = { static struct miscdevice wcnss_misc = { .minor = MISC_DYNAMIC_MINOR, -.name = DEVICE, + .name = DEVICE, .fops = &wcnss_node_fops, }; |