* [PATCH 3.9] brcmsmac: Fix merge issue
@ 2013-04-25 10:27 Piotr Haber
2013-04-25 20:15 ` Arend van Spriel
0 siblings, 1 reply; 2+ messages in thread
From: Piotr Haber @ 2013-04-25 10:27 UTC (permalink / raw)
To: linville; +Cc: linux-wireless, Piotr Haber
Commit 7088f4835aa353f7226e57e73fd9e6564a4dfb75
"Merge branch 'master' of
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless"
ramoved call to brcms_led_unregister in mac80211_if.c
Reviewed-by: Hante Meuleman <meuleman@broadcom.com>
Reviewed-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Piotr Haber <phaber@broadcom.com>
---
.../net/wireless/brcm80211/brcmsmac/mac80211_if.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c b/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
index 2346821..3a65447 100644
--- a/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
+++ b/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
@@ -336,6 +336,7 @@ static void brcms_remove(struct bcma_device *pdev)
struct brcms_info *wl = hw->priv;
if (wl->wlc) {
+ brcms_led_unregister(wl);
wiphy_rfkill_set_hw_state(wl->pub->ieee_hw->wiphy, false);
wiphy_rfkill_stop_polling(wl->pub->ieee_hw->wiphy);
ieee80211_unregister_hw(hw);
--
1.7.9.5
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH 3.9] brcmsmac: Fix merge issue
2013-04-25 10:27 [PATCH 3.9] brcmsmac: Fix merge issue Piotr Haber
@ 2013-04-25 20:15 ` Arend van Spriel
0 siblings, 0 replies; 2+ messages in thread
From: Arend van Spriel @ 2013-04-25 20:15 UTC (permalink / raw)
To: Piotr Haber; +Cc: linville, linux-wireless
On 04/25/2013 12:27 PM, Piotr Haber wrote:
> Commit 7088f4835aa353f7226e57e73fd9e6564a4dfb75
> "Merge branch 'master' of
> git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless"
> ramoved call to brcms_led_unregister in mac80211_if.c
>
Hi Piotr,
After we discussed this, I realized that the led support was added to
wireless-next, ie. for v3.10 kernel.
John,
Can you take it in wireless-next repository this close to the merge
window? It applies without issues to that.
Regards,
Arend
> Reviewed-by: Hante Meuleman <meuleman@broadcom.com>
> Reviewed-by: Arend van Spriel <arend@broadcom.com>
> Signed-off-by: Piotr Haber <phaber@broadcom.com>
> ---
> .../net/wireless/brcm80211/brcmsmac/mac80211_if.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c b/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
> index 2346821..3a65447 100644
> --- a/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
> +++ b/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
> @@ -336,6 +336,7 @@ static void brcms_remove(struct bcma_device *pdev)
> struct brcms_info *wl = hw->priv;
>
> if (wl->wlc) {
> + brcms_led_unregister(wl);
> wiphy_rfkill_set_hw_state(wl->pub->ieee_hw->wiphy, false);
> wiphy_rfkill_stop_polling(wl->pub->ieee_hw->wiphy);
> ieee80211_unregister_hw(hw);
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-04-25 20:16 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-04-25 10:27 [PATCH 3.9] brcmsmac: Fix merge issue Piotr Haber
2013-04-25 20:15 ` Arend van Spriel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).