From: Greg Kroah-Hartman Date: Sun, 17 Nov 2024 21:14:51 +0000 (+0100) Subject: 5.10-stable patches X-Git-Tag: v6.12.1~51 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=158155786ec75fd8b39d96b7fa923a1f3be0c3b5;p=thirdparty%2Fkernel%2Fstable-queue.git 5.10-stable patches added patches: mmc-core-fix-return-value-check-in-devm_mmc_alloc_host.patch --- diff --git a/queue-5.10/mmc-core-fix-return-value-check-in-devm_mmc_alloc_host.patch b/queue-5.10/mmc-core-fix-return-value-check-in-devm_mmc_alloc_host.patch new file mode 100644 index 00000000000..3e61a6868b4 --- /dev/null +++ b/queue-5.10/mmc-core-fix-return-value-check-in-devm_mmc_alloc_host.patch @@ -0,0 +1,46 @@ +From 71d04535e853305a76853b28a01512a62006351d Mon Sep 17 00:00:00 2001 +From: Yang Yingliang +Date: Fri, 17 Feb 2023 10:43:33 +0800 +Subject: mmc: core: fix return value check in devm_mmc_alloc_host() + +From: Yang Yingliang + +commit 71d04535e853305a76853b28a01512a62006351d upstream. + +mmc_alloc_host() returns NULL pointer not PTR_ERR(), if it +fails, so replace the IS_ERR() check with NULL pointer check. + +In commit 418f7c2de133 ("mmc: meson-gx: use devm_mmc_alloc_host"), +it checks NULL pointer not PTR_ERR, if devm_mmc_alloc_host() fails, +so make it to return NULL pointer to keep same with mmc_alloc_host(), +the drivers don't need to change the error handle when switch to +use devm_mmc_alloc_host(). + +Fixes: 80df83c2c57e ("mmc: core: add devm_mmc_alloc_host") +Signed-off-by: Yang Yingliang +Reviewed-by: Heiner Kallweit +Link: https://lore.kernel.org/r/20230217024333.4018279-1-yangyingliang@huawei.com +Signed-off-by: Ulf Hansson +Signed-off-by: Greg Kroah-Hartman +--- + drivers/mmc/core/host.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +--- a/drivers/mmc/core/host.c ++++ b/drivers/mmc/core/host.c +@@ -523,12 +523,12 @@ struct mmc_host *devm_mmc_alloc_host(str + + dr = devres_alloc(devm_mmc_host_release, sizeof(*dr), GFP_KERNEL); + if (!dr) +- return ERR_PTR(-ENOMEM); ++ return NULL; + + host = mmc_alloc_host(extra, dev); +- if (IS_ERR(host)) { ++ if (!host) { + devres_free(dr); +- return host; ++ return NULL; + } + + *dr = host; diff --git a/queue-5.10/series b/queue-5.10/series index 673ea0c2670..45eddaa621f 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -10,3 +10,4 @@ ocfs2-fix-ubsan-warning-in-ocfs2_verify_volume.patch nilfs2-fix-null-ptr-deref-in-block_dirty_buffer-tracepoint.patch revert-mmc-dw_mmc-fix-idmac-operation-with-pages-bigger-than-4k.patch drm-bridge-tc358768-fix-dsi-command-tx.patch +mmc-core-fix-return-value-check-in-devm_mmc_alloc_host.patch