Merge "msm: qdsp6v2: Buffer address for Record and playback is 32-byte aligned"
diff --git a/drivers/net/wireless/wcnss/wcnss_wlan.c b/drivers/net/wireless/wcnss/wcnss_wlan.c
index 33d11b1..8dc30ee 100644
--- a/drivers/net/wireless/wcnss/wcnss_wlan.c
+++ b/drivers/net/wireless/wcnss/wcnss_wlan.c
@@ -2032,19 +2032,17 @@
static int wcnss_node_open(struct inode *inode, struct file *file)
{
struct platform_device *pdev;
+ int rc = 0;
if (!penv)
return -EFAULT;
- /* first open is only to trigger WCNSS platform driver */
if (!penv->triggered) {
pr_info(DEVICE " triggered by userspace\n");
pdev = penv->pdev;
- return wcnss_trigger_config(pdev);
-
- } else if (penv->device_opened) {
- pr_info(DEVICE " already opened\n");
- return -EBUSY;
+ rc = wcnss_trigger_config(pdev);
+ if (rc)
+ return -EFAULT;
}
mutex_lock(&penv->dev_lock);
@@ -2055,7 +2053,7 @@
penv->device_opened = 1;
mutex_unlock(&penv->dev_lock);
- return 0;
+ return rc;
}
static ssize_t wcnss_wlan_read(struct file *fp, char __user