Return-path: Received: from mms2.broadcom.com ([216.31.210.18]:2720 "EHLO mms2.broadcom.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932087Ab3DYUQK (ORCPT ); Thu, 25 Apr 2013 16:16:10 -0400 Message-ID: <51798EF9.9020803@broadcom.com> (sfid-20130425_221614_498274_48755A53) Date: Thu, 25 Apr 2013 22:15:53 +0200 From: "Arend van Spriel" MIME-Version: 1.0 To: "Piotr Haber" cc: linville@tuxdriver.com, linux-wireless@vger.kernel.org Subject: Re: [PATCH 3.9] brcmsmac: Fix merge issue References: <1366885629-11382-1-git-send-email-phaber@broadcom.com> In-Reply-To: <1366885629-11382-1-git-send-email-phaber@broadcom.com> Content-Type: text/plain; charset=iso-8859-1; format=flowed Sender: linux-wireless-owner@vger.kernel.org List-ID: 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 > Reviewed-by: Arend van Spriel > Signed-off-by: Piotr Haber > --- > .../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); >