From 1cd929125116aec9b367b893f0642714d28d387e Mon Sep 17 00:00:00 2001 From: Jianxin Pan Date: Fri, 17 Mar 2017 15:25:10 +0800 Subject: [PATCH] emmc: restore sdio_reset_comm PD#138714: emmc: sdio_reset_comm is removed to fix upstream merge conflict. Now restore again. Change-Id: I0b2fc161d0fe7c4938a33e0715ee5cc3c5b4a12b Signed-off-by: Jianxin Pan --- drivers/amlogic/mmc/amlsd.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/amlogic/mmc/amlsd.c b/drivers/amlogic/mmc/amlsd.c index 389cb47a4bc2..77c3da545701 100644 --- a/drivers/amlogic/mmc/amlsd.c +++ b/drivers/amlogic/mmc/amlsd.c @@ -370,8 +370,7 @@ void sdio_reinit(void) { if (sdio_host) { if (sdio_host->card) - //temp remove for upstream merge comflict - ;//sdio_reset_comm(sdio_host->card); + sdio_reset_comm(sdio_host->card); else sdio_rescan(sdio_host); } else {