brcmfmac: fix memleak due to calling brcmf_sdiod_sgtable_alloc() twice
authorArend Van Spriel <arend.vanspriel@broadcom.com>
Wed, 26 Jul 2017 12:09:24 +0000 (13:09 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 11 Aug 2017 15:49:28 +0000 (08:49 -0700)
commitf5214eb4baf87b0134acf98c29150071fa3b815c
tree0745087ac58fa893a875917cbc525ce12d278ffc
parentde8c33290f1c8fdd037b6e3d43ea888928f21e8c
brcmfmac: fix memleak due to calling brcmf_sdiod_sgtable_alloc() twice

commit 5f5d03143de5e0c593da4ab18fc6393c2815e108 upstream.

Due to a bugfix in wireless tree and the commit mentioned below a merge
was needed which went haywire. So the submitted change resulted in the
function brcmf_sdiod_sgtable_alloc() being called twice during the probe
thus leaking the memory of the first call.

Fixes: 4d7928959832 ("brcmfmac: switch to new platform data")
Reported-by: Stefan Wahren <stefan.wahren@i2se.com>
Tested-by: Stefan Wahren <stefan.wahren@i2se.com>
Reviewed-by: Hante Meuleman <hante.meuleman@broadcom.com>
Signed-off-by: Arend van Spriel <arend.vanspriel@broadcom.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c