diff mbox series

mmc: mediatek: fix mem leak in msdc_drv_probe

Message ID 20201112092530.32446-1-zhengliang6@huawei.com (mailing list archive)
State New, archived
Headers show
Series mmc: mediatek: fix mem leak in msdc_drv_probe | expand

Commit Message

Zheng Liang Nov. 12, 2020, 9:25 a.m. UTC
It should use mmc_free_host to free mem in error patch of
msdc_drv_probe.

Reported-by: Hulk Robot <hulkci@huawei.com>
Signed-off-by: Zheng Liang <zhengliang6@huawei.com>
---
 drivers/mmc/host/mtk-sd.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

Comments

Chaotian Jing (井朝天) Nov. 12, 2020, 8:51 a.m. UTC | #1
On Thu, 2020-11-12 at 17:25 +0800, Zheng Liang wrote:
> It should use mmc_free_host to free mem in error patch of
> msdc_drv_probe.
> 
> Reported-by: Hulk Robot <hulkci@huawei.com>
> Signed-off-by: Zheng Liang <zhengliang6@huawei.com>
Reviewed-by: Chaotian Jing <chaotian.jing@mediatek.com>
> ---
>  drivers/mmc/host/mtk-sd.c | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/mmc/host/mtk-sd.c b/drivers/mmc/host/mtk-sd.c
> index fc5ee5df91ad..eac7838e2dac 100644
> --- a/drivers/mmc/host/mtk-sd.c
> +++ b/drivers/mmc/host/mtk-sd.c
> @@ -2504,8 +2504,10 @@ static int msdc_drv_probe(struct platform_device *pdev)
>  
>  	host->reset = devm_reset_control_get_optional_exclusive(&pdev->dev,
>  								"hrst");
> -	if (IS_ERR(host->reset))
> -		return PTR_ERR(host->reset);
> +	if (IS_ERR(host->reset)) {
> +		ret = PTR_ERR(host->reset);
> +		goto host_free;
> +	}
>  
>  	host->irq = platform_get_irq(pdev, 0);
>  	if (host->irq < 0) {
Ulf Hansson Nov. 17, 2020, 11:50 a.m. UTC | #2
On Thu, 12 Nov 2020 at 09:27, Zheng Liang <zhengliang6@huawei.com> wrote:
>
> It should use mmc_free_host to free mem in error patch of
> msdc_drv_probe.
>
> Reported-by: Hulk Robot <hulkci@huawei.com>
> Signed-off-by: Zheng Liang <zhengliang6@huawei.com>

Applied for next, thanks!

Kind regards
Uffe


> ---
>  drivers/mmc/host/mtk-sd.c | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/mmc/host/mtk-sd.c b/drivers/mmc/host/mtk-sd.c
> index fc5ee5df91ad..eac7838e2dac 100644
> --- a/drivers/mmc/host/mtk-sd.c
> +++ b/drivers/mmc/host/mtk-sd.c
> @@ -2504,8 +2504,10 @@ static int msdc_drv_probe(struct platform_device *pdev)
>
>         host->reset = devm_reset_control_get_optional_exclusive(&pdev->dev,
>                                                                 "hrst");
> -       if (IS_ERR(host->reset))
> -               return PTR_ERR(host->reset);
> +       if (IS_ERR(host->reset)) {
> +               ret = PTR_ERR(host->reset);
> +               goto host_free;
> +       }
>
>         host->irq = platform_get_irq(pdev, 0);
>         if (host->irq < 0) {
> --
> 2.17.1
>
diff mbox series

Patch

diff --git a/drivers/mmc/host/mtk-sd.c b/drivers/mmc/host/mtk-sd.c
index fc5ee5df91ad..eac7838e2dac 100644
--- a/drivers/mmc/host/mtk-sd.c
+++ b/drivers/mmc/host/mtk-sd.c
@@ -2504,8 +2504,10 @@  static int msdc_drv_probe(struct platform_device *pdev)
 
 	host->reset = devm_reset_control_get_optional_exclusive(&pdev->dev,
 								"hrst");
-	if (IS_ERR(host->reset))
-		return PTR_ERR(host->reset);
+	if (IS_ERR(host->reset)) {
+		ret = PTR_ERR(host->reset);
+		goto host_free;
+	}
 
 	host->irq = platform_get_irq(pdev, 0);
 	if (host->irq < 0) {