From: John W. Linville Date: Mon, 29 Oct 2012 20:05:51 +0000 (-0400) Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless X-Git-Tag: v3.8-rc1~139^2~17^2~251 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ab3d59d265e772e734c36fe738809cb1a910f566;p=platform%2Fupstream%2Fkernel-adaptation-pc.git Merge branch 'master' of git://git./linux/kernel/git/linville/wireless Conflicts: drivers/net/wireless/mwifiex/cfg80211.c --- ab3d59d265e772e734c36fe738809cb1a910f566 diff --cc drivers/net/wireless/mwifiex/cfg80211.c index 2ab903f,780d3e1..fdb1eb8 --- a/drivers/net/wireless/mwifiex/cfg80211.c +++ b/drivers/net/wireless/mwifiex/cfg80211.c @@@ -1826,13 -1825,6 +1826,11 @@@ mwifiex_cfg80211_scan(struct wiphy *wip return -EBUSY; } - priv->scan_request = request; - + if (priv->user_scan_cfg) { + dev_err(priv->adapter->dev, "cmd: Scan already in process..\n"); + return -EBUSY; + } + priv->user_scan_cfg = kzalloc(sizeof(struct mwifiex_user_scan_cfg), GFP_KERNEL); if (!priv->user_scan_cfg) {