The use of && instead of || caused a NULL pointer dereference if
gpio setup was not passed via platform data

Signed-off-by: Alexander Tarasikov <[email protected]>
---
 drivers/mmc/host/msm_sdcc.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/mmc/host/msm_sdcc.c b/drivers/mmc/host/msm_sdcc.c
index a4c865a..d06539d 100644
--- a/drivers/mmc/host/msm_sdcc.c
+++ b/drivers/mmc/host/msm_sdcc.c
@@ -939,7 +939,7 @@ static void msmsdcc_setup_gpio(struct msmsdcc_host *host, 
bool enable)
        struct msm_mmc_gpio_data *curr;
        int i, rc = 0;

-       if (!host->plat->gpio_data && host->gpio_config_status == enable)
+       if (!host->plat->gpio_data || host->gpio_config_status == enable)
                return;

        curr = host->plat->gpio_data;
--
1.7.5.4
--
To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to