From: Sasha Levin <sashal@kernel.org>
To: stable@vger.kernel.org
Cc: Andy-ld Lu <andy-ld.lu@mediatek.com>, Sasha Levin <sashal@kernel.org>
Subject: Re: [PATCH 6.1.y] mmc: mtk-sd: Fix error handle of probe function
Date: Mon, 9 Dec 2024 09:35:32 -0500 [thread overview]
Message-ID: <20241209083259-71d177fe08992f4c@stable.kernel.org> (raw)
In-Reply-To: <20241209032446.7404-1-andy-ld.lu@mediatek.com>
[ Sasha's backport helper bot ]
Hi,
Found matching upstream commit: 291220451c775a054cedc4fab4578a1419eb6256
Status in newer kernel trees:
6.12.y | Present (different SHA1: 4600bcb7eff1)
6.6.y | Present (different SHA1: 61788dcf2b34)
6.1.y | Not found
Note: The patch differs from the upstream commit:
---
1: 291220451c775 ! 1: a5165d693153c 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.1.y | Success | Success |
prev parent reply other threads:[~2024-12-09 14:35 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-12-06 9:39 FAILED: patch "[PATCH] mmc: mtk-sd: Fix error handle of probe function" failed to apply to 6.1-stable tree gregkh
2024-12-09 3:24 ` [PATCH 6.1.y] mmc: mtk-sd: Fix error handle of probe function Andy-ld Lu
2024-12-09 14:35 ` Sasha Levin [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20241209083259-71d177fe08992f4c@stable.kernel.org \
--to=sashal@kernel.org \
--cc=andy-ld.lu@mediatek.com \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.