From 26e2d55b16c1870f802b08b649d9db1732a67903 Mon Sep 17 00:00:00 2001 From: Oleksandr Suvorov Date: Sat, 16 May 2020 22:09:30 +0300 Subject: linux-toradex-mainline: remove obsolete patch file The patch 0015-Revert-mmc-core-fix-error-path-in-mmc_host_alloc.patch has already been removed from the recipe as successfully upstreamed. Remove the file as well. Related-to: ELB-2724 Signed-off-by: Oleksandr Suvorov --- ...mmc-core-fix-error-path-in-mmc_host_alloc.patch | 31 ---------------------- .../linux/linux-toradex-mainline_4.14.bb | 1 - 2 files changed, 32 deletions(-) delete mode 100644 recipes-kernel/linux/linux-toradex-mainline-4.14/0015-Revert-mmc-core-fix-error-path-in-mmc_host_alloc.patch diff --git a/recipes-kernel/linux/linux-toradex-mainline-4.14/0015-Revert-mmc-core-fix-error-path-in-mmc_host_alloc.patch b/recipes-kernel/linux/linux-toradex-mainline-4.14/0015-Revert-mmc-core-fix-error-path-in-mmc_host_alloc.patch deleted file mode 100644 index dd8d127..0000000 --- a/recipes-kernel/linux/linux-toradex-mainline-4.14/0015-Revert-mmc-core-fix-error-path-in-mmc_host_alloc.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 12e25f531b9d910ed72ad5b6dd5e5b36a3f664aa Mon Sep 17 00:00:00 2001 -Message-Id: <12e25f531b9d910ed72ad5b6dd5e5b36a3f664aa.1531317141.git.marcel.ziswiler@toradex.com> -In-Reply-To: <6654e1bd342708a683daf47e7558455f709a3e7e.1531317141.git.marcel.ziswiler@toradex.com> -References: <6654e1bd342708a683daf47e7558455f709a3e7e.1531317141.git.marcel.ziswiler@toradex.com> -From: Marcel Ziswiler -Date: Thu, 19 Apr 2018 13:49:00 +0200 -Subject: [PATCH 15/33] Revert "mmc: core: fix error path in mmc_host_alloc" - -This reverts commit 1ed2171944888cf6787990a0f6387b717ba72e24. - -Signed-off-by: Marcel Ziswiler ---- - drivers/mmc/core/host.c | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/drivers/mmc/core/host.c b/drivers/mmc/core/host.c -index ad88deb2e8f3..3740fb0052a4 100644 ---- a/drivers/mmc/core/host.c -+++ b/drivers/mmc/core/host.c -@@ -376,8 +376,6 @@ struct mmc_host *mmc_alloc_host(int extra, struct device *dev) - - if (mmc_gpio_alloc(host)) { - put_device(&host->class_dev); -- ida_simple_remove(&mmc_host_ida, host->index); -- kfree(host); - return NULL; - } - --- -2.14.4 - diff --git a/recipes-kernel/linux/linux-toradex-mainline_4.14.bb b/recipes-kernel/linux/linux-toradex-mainline_4.14.bb index 42abb82..3954c52 100644 --- a/recipes-kernel/linux/linux-toradex-mainline_4.14.bb +++ b/recipes-kernel/linux/linux-toradex-mainline_4.14.bb @@ -31,7 +31,6 @@ GENERIC_PATCHES = " \ file://0012-apalis-tk1-support-for-k20-mfd.patch \ file://0013-usb-chipidea-tegra-Use-aligned-DMA-on-Tegra30.patch \ file://0014-usb-chipidea-tegra-Use-aligned-DMA-on-Tegra114-124.patch \ - file://0015-Revert-mmc-core-fix-error-path-in-mmc_host_alloc.patch \ file://0016-Revert-mmc-core-simplify-ida-handling.patch \ file://0017-mmc-read-mmc-alias-from-device-tree.patch \ file://0018-apalis-t30-mainline-force-fixed-ids-for-sdmmc-contro.patch \ -- cgit v1.2.3