From 21d5448e3cdfc31106017724e17e15b8d19960e1 Mon Sep 17 00:00:00 2001 From: Arend van Spriel Date: Fri, 8 Feb 2013 15:53:51 +0100 Subject: [PATCH] --- yaml --- r: 352617 b: refs/heads/master c: 1ce3086ccd81793fd6affb350826a0c41dc3ef37 h: refs/heads/master i: 352615: 4cac8979fed1e0a6b9ba6efa4ae8d3c09df1d699 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/brcm80211/brcmfmac/p2p.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index cb0a5573f8f9..62a82345cb6d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f2058dde8c2be70cc22dbd8f718ab6c33cf6ea11 +refs/heads/master: 1ce3086ccd81793fd6affb350826a0c41dc3ef37 diff --git a/trunk/drivers/net/wireless/brcm80211/brcmfmac/p2p.c b/trunk/drivers/net/wireless/brcm80211/brcmfmac/p2p.c index aac054cc0069..1c854f607d5b 100644 --- a/trunk/drivers/net/wireless/brcm80211/brcmfmac/p2p.c +++ b/trunk/drivers/net/wireless/brcm80211/brcmfmac/p2p.c @@ -982,9 +982,9 @@ int brcmf_p2p_remain_on_channel(struct wiphy *wiphy, struct wireless_dev *wdev, memcpy(&p2p->remain_on_channel, channel, sizeof(*channel)); *cookie = p2p->remain_on_channel_cookie; + cfg80211_ready_on_channel(wdev, *cookie, channel, duration, GFP_KERNEL); exit: - cfg80211_ready_on_channel(wdev, *cookie, channel, duration, GFP_KERNEL); return err; }