Importing "grsecurity-3.1-3.19.2-201503201903.patch"

[people/ms/linux.git] / drivers / mmc / host / sdhci-esdhc-imx.c

diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c
index af1f7c0f95450e94a923146f4d53240b7ba3e821..00d368ad59bfb6aa599ccff52e66174d7288678c 100644 (file)
--- a/drivers/mmc/host/sdhci-esdhc-imx.c
+++ b/drivers/mmc/host/sdhci-esdhc-imx.c
@@ -989,9 +989,12 @@ static int sdhci_esdhc_imx_probe(struct platform_device *pdev)
                host->mmc->caps |= MMC_CAP_1_8V_DDR;
        }
 
-       if (imx_data->socdata->flags & ESDHC_FLAG_MAN_TUNING)
-               sdhci_esdhc_ops.platform_execute_tuning =
+       if (imx_data->socdata->flags & ESDHC_FLAG_MAN_TUNING) {
+               pax_open_kernel();
+               *(void **)&sdhci_esdhc_ops.platform_execute_tuning =
                                        esdhc_executing_tuning;
+               pax_close_kernel();
+       }
 
        if (imx_data->socdata->flags & ESDHC_FLAG_STD_TUNING)
                writel(readl(host->ioaddr + ESDHC_TUNING_CTRL) |