From d7681b1fe11be4f3bc6371766519b242c11d122f Mon Sep 17 00:00:00 2001
From: Franky Lin <frankyl@broadcom.com>
Date: Fri, 4 Nov 2011 22:23:39 +0100
Subject: [PATCH] --- yaml --- r: 277803 b: refs/heads/master c:
 a8a6c04586233e12551552c292797cb56b31dade h: refs/heads/master i:   277801:
 ff33cb26db9b8e77ed35ee57ca7f57bf460aaaff   277799:
 8d402b07e96c758dfba0bd6190f338f5c8372059 v: v3

---
 [refs]                                                |  2 +-
 .../net/wireless/brcm80211/brcmfmac/dhd_sdio.c        | 11 +----------
 .../net/wireless/brcm80211/brcmfmac/sdio_chip.c       |  9 +++++++++
 .../net/wireless/brcm80211/brcmfmac/sdio_chip.h       |  1 +
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index 3165b3f04d7b..64f59a665198 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2bc78e10d841f81ea7a2b25bc0481ea4af06437e
+refs/heads/master: a8a6c04586233e12551552c292797cb56b31dade
diff --git a/trunk/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c b/trunk/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
index af6f3a4b9da0..e05c7845dbd7 100644
--- a/trunk/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
+++ b/trunk/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
@@ -3967,15 +3967,6 @@ brcmf_sdbrcm_watchdog(unsigned long data)
 	}
 }
 
-static void
-brcmf_sdbrcm_chip_detach(struct brcmf_bus *bus)
-{
-	brcmf_dbg(TRACE, "Enter\n");
-
-	kfree(bus->ci);
-	bus->ci = NULL;
-}
-
 static void brcmf_sdbrcm_release_dongle(struct brcmf_bus *bus)
 {
 	brcmf_dbg(TRACE, "Enter\n");
@@ -3983,7 +3974,7 @@ static void brcmf_sdbrcm_release_dongle(struct brcmf_bus *bus)
 	if (bus->ci) {
 		brcmf_sdbrcm_clkctl(bus, CLK_AVAIL, false);
 		brcmf_sdbrcm_clkctl(bus, CLK_NONE, false);
-		brcmf_sdbrcm_chip_detach(bus);
+		brcmf_sdio_chip_detach(&bus->ci);
 		if (bus->vars && bus->varsz)
 			kfree(bus->vars);
 		bus->vars = NULL;
diff --git a/trunk/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c b/trunk/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c
index 4acdda11d07e..ea12a4c3c2fd 100644
--- a/trunk/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c
+++ b/trunk/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c
@@ -354,3 +354,12 @@ int brcmf_sdio_chip_attach(struct brcmf_sdio_dev *sdiodev,
 	kfree(ci);
 	return ret;
 }
+
+void
+brcmf_sdio_chip_detach(struct chip_info **ci_ptr)
+{
+	brcmf_dbg(TRACE, "Enter\n");
+
+	kfree(*ci_ptr);
+	*ci_ptr = NULL;
+}
diff --git a/trunk/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.h b/trunk/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.h
index 6ad5ea6057d8..13b09a49b7b0 100644
--- a/trunk/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.h
+++ b/trunk/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.h
@@ -141,5 +141,6 @@ extern void brcmf_sdio_chip_coredisable(struct brcmf_sdio_dev *sdiodev,
 					u32 corebase);
 extern int brcmf_sdio_chip_attach(struct brcmf_sdio_dev *sdiodev,
 				  struct chip_info **ci_ptr, u32 regs);
+extern void brcmf_sdio_chip_detach(struct chip_info **ci_ptr);
 
 #endif		/* _BRCMFMAC_SDIO_CHIP_H_ */