diff options
| author | Arend van Spriel <arend.vanspriel@broadcom.com> | 2019-07-11 11:05:06 +0200 |
|---|---|---|
| committer | Kalle Valo <kvalo@codeaurora.org> | 2019-07-24 14:51:21 +0300 |
| commit | a84a60ccdd65278485fb495f468a5ab91a75c649 (patch) | |
| tree | 5b5b31ea736aada9be77a03661d106cbabce0b52 /drivers/net/wireless/broadcom/brcm80211/brcmfmac/proto.c | |
| parent | fa9050927fa885410055ee03c948c2252693d296 (diff) | |
| download | blackbird-op-linux-a84a60ccdd65278485fb495f468a5ab91a75c649.tar.gz blackbird-op-linux-a84a60ccdd65278485fb495f468a5ab91a75c649.zip | |
Revert "brcmfmac: fix NULL pointer derefence during USB disconnect"
This reverts commit 5cdb0ef6144f47440850553579aa923c20a63f23. Subsequent
changes make rework the driver code fixing the issue differently.
Signed-off-by: Arend van Spriel <arend.vanspriel@broadcom.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Diffstat (limited to 'drivers/net/wireless/broadcom/brcm80211/brcmfmac/proto.c')
| -rw-r--r-- | drivers/net/wireless/broadcom/brcm80211/brcmfmac/proto.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/proto.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/proto.c index e3d1b075044b..2e911d4874af 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/proto.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/proto.c @@ -56,22 +56,16 @@ fail: return -ENOMEM; } -void brcmf_proto_detach_post_delif(struct brcmf_pub *drvr) +void brcmf_proto_detach(struct brcmf_pub *drvr) { brcmf_dbg(TRACE, "Enter\n"); if (drvr->proto) { if (drvr->bus_if->proto_type == BRCMF_PROTO_BCDC) - brcmf_proto_bcdc_detach_post_delif(drvr); + brcmf_proto_bcdc_detach(drvr); else if (drvr->bus_if->proto_type == BRCMF_PROTO_MSGBUF) brcmf_proto_msgbuf_detach(drvr); kfree(drvr->proto); drvr->proto = NULL; } } - -void brcmf_proto_detach_pre_delif(struct brcmf_pub *drvr) -{ - if (drvr->proto && drvr->bus_if->proto_type == BRCMF_PROTO_BCDC) - brcmf_proto_bcdc_detach_pre_delif(drvr); -} |
