From f5a47858148e64734858925bb89fc833a38ea298 Mon Sep 17 00:00:00 2001
From: Bing Zhao <bzhao@marvell.com>
Date: Fri, 19 Apr 2013 17:44:41 -0700
Subject: [PATCH] --- yaml --- r: 369643 b: refs/heads/master c:
 66aa1ae2e73c4b0f70d425d38fee2f01161a7d64 h: refs/heads/master i:   369641:
 2536e47a85e648a5e39d008ef818ad6cdff6e4a4   369639:
 5c0a1a0326a0c6a505549ca40687e2c535ab1bc7 v: v3

---
 [refs]                                        | 2 +-
 trunk/drivers/net/wireless/mwifiex/cfg80211.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 147a5f44eeac..2138c0d9ab67 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5586d3e2f211a7c9c1d5fd639c88c8479b78a13d
+refs/heads/master: 66aa1ae2e73c4b0f70d425d38fee2f01161a7d64
diff --git a/trunk/drivers/net/wireless/mwifiex/cfg80211.c b/trunk/drivers/net/wireless/mwifiex/cfg80211.c
index 8c468c30b2d9..2a604eb0fd1d 100644
--- a/trunk/drivers/net/wireless/mwifiex/cfg80211.c
+++ b/trunk/drivers/net/wireless/mwifiex/cfg80211.c
@@ -2152,6 +2152,9 @@ struct wireless_dev *mwifiex_add_virtual_intf(struct wiphy *wiphy,
 		priv->bss_started = 0;
 		priv->bss_num = 0;
 
+		if (mwifiex_cfg80211_init_p2p_client(priv))
+			return ERR_PTR(-EFAULT);
+
 		break;
 	default:
 		wiphy_err(wiphy, "type not supported\n");