[ Sasha's backport helper bot ]
Hi,
Found matching upstream commit: 291220451c775a054cedc4fab4578a1419eb6256
Status in newer kernel trees: 6.12.y | Present (different SHA1: da15282c09f8) 6.6.y | Present (different SHA1: 359c7e5ed332)
Note: The patch differs from the upstream commit: --- 1: 291220451c775 ! 1: 5a73d6712ce59 mmc: mtk-sd: Fix error handle of probe function @@ Commit message make sure the clocks be disabled after probe failure.
Fixes: ffaea6ebfe9c ("mmc: mtk-sd: Use readl_poll_timeout instead of open-coded polling") - Fixes: 7a2fa8eed936 ("mmc: mtk-sd: use devm_mmc_alloc_host") Signed-off-by: Andy-ld Lu andy-ld.lu@mediatek.com Reviewed-by: AngeloGioacchino Del Regno angelogioacchino.delregno@collabora.com Cc: stable@vger.kernel.org Message-ID: 20241107121215.5201-1-andy-ld.lu@mediatek.com Signed-off-by: Ulf Hansson ulf.hansson@linaro.org + (cherry picked from commit 291220451c775a054cedc4fab4578a1419eb6256)
## drivers/mmc/host/mtk-sd.c ## @@ drivers/mmc/host/mtk-sd.c: static int msdc_drv_probe(struct platform_device *pdev) @@ drivers/mmc/host/mtk-sd.c: static int msdc_drv_probe(struct platform_device *pde GFP_KERNEL); if (!host->cq_host) { ret = -ENOMEM; -- goto release_mem; +- goto host_free; + goto release; } host->cq_host->caps |= CQHCI_TASK_DESC_SZ_128; @@ drivers/mmc/host/mtk-sd.c: static int msdc_drv_probe(struct platform_device *pde host->cq_host->ops = &msdc_cmdq_ops; ret = cqhci_init(host->cq_host, mmc, true); if (ret) -- goto release_mem; +- goto host_free; + goto release; mmc->max_segs = 128; /* cqhci 16bit length */ ---
Results of testing on various branches:
| Branch | Patch Apply | Build Test | |---------------------------|-------------|------------| | stable/linux-6.6.y | Success | Success |