From 03ad380ea4cf1257fa6cde74973108ea54b85cd2 Mon Sep 17 00:00:00 2001 From: Seung-Woo Kim Date: Thu, 1 Jun 2023 11:14:44 +0900 Subject: [PATCH] mmc: card: Fix build error without AMLOGIC_MMC Fix build error without CONFIG_AMLOGIC_MMC. Change-Id: I3a76432c4441b50e372c4393030f191a9cec9b4d Fixes: a0ed97ec7c26 ("emmc: ffu: add emmc ffu update support [1/1]") Fixes: 4ee9cb927f1c ("sdio: optimize sdio suspend/resume [1/1]") Signed-off-by: Seung-Woo Kim --- drivers/mmc/card/block.c | 2 +- drivers/mmc/core/sdio.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c index f1dba1d040f5..fba8242a29c7 100644 --- a/drivers/mmc/card/block.c +++ b/drivers/mmc/card/block.c @@ -799,10 +799,10 @@ static int __mmc_blk_ioctl_cmd(struct mmc_card *card, struct mmc_blk_data *md, struct mmc_data data = {0}; #ifdef CONFIG_AMLOGIC_MMC struct mmc_command sbc = {0}; + struct scatterlist *ffu_sg = NULL; #endif struct mmc_request mrq = {NULL}; struct scatterlist sg; - struct scatterlist *ffu_sg = NULL; int err; int is_rpmb = false; u32 status = 0; diff --git a/drivers/mmc/core/sdio.c b/drivers/mmc/core/sdio.c index b4fe12f92b4a..2e3f4e9db663 100644 --- a/drivers/mmc/core/sdio.c +++ b/drivers/mmc/core/sdio.c @@ -919,8 +919,10 @@ static int mmc_sdio_suspend(struct mmc_host *host) { mmc_claim_host(host); +#ifdef CONFIG_AMLOGIC_MMC if (host->wifi_down_f) host->pm_flags |= MMC_PM_KEEP_POWER; +#endif if (mmc_card_keep_power(host) && mmc_card_wake_sdio_irq(host)) sdio_disable_wide(host->card); -- 2.34.1