Commit c5d5e9c4 authored by Paulius Zaleckas's avatar Paulius Zaleckas Committed by Pierre Ossman

imxmmc: fix crash when no platform data is provided

Don't crash if no platform data is provided.
In this case assume that card is present.
Signed-off-by: default avatarPaulius Zaleckas <paulius.zaleckas@teltonika.lt>
Acked-by: default avatarPavel Pisa <pisa@cmp.felk.cvut.cz>
Signed-off-by: default avatarPierre Ossman <drzeus@drzeus.cx>
parent 5fc63dfb
...@@ -905,7 +905,8 @@ static void imxmci_check_status(unsigned long data) ...@@ -905,7 +905,8 @@ static void imxmci_check_status(unsigned long data)
{ {
struct imxmci_host *host = (struct imxmci_host *)data; struct imxmci_host *host = (struct imxmci_host *)data;
if( host->pdata->card_present(mmc_dev(host->mmc)) != host->present ) { if (host->pdata && host->pdata->card_present &&
host->pdata->card_present(mmc_dev(host->mmc)) != host->present) {
host->present ^= 1; host->present ^= 1;
dev_info(mmc_dev(host->mmc), "card %s\n", dev_info(mmc_dev(host->mmc), "card %s\n",
host->present ? "inserted" : "removed"); host->present ? "inserted" : "removed");
...@@ -968,6 +969,8 @@ static int imxmci_probe(struct platform_device *pdev) ...@@ -968,6 +969,8 @@ static int imxmci_probe(struct platform_device *pdev)
host->mmc = mmc; host->mmc = mmc;
host->dma_allocated = 0; host->dma_allocated = 0;
host->pdata = pdev->dev.platform_data; host->pdata = pdev->dev.platform_data;
if (!host->pdata)
dev_warn(&pdev->dev, "No platform data provided!\n");
spin_lock_init(&host->lock); spin_lock_init(&host->lock);
host->res = r; host->res = r;
...@@ -1020,7 +1023,11 @@ static int imxmci_probe(struct platform_device *pdev) ...@@ -1020,7 +1023,11 @@ static int imxmci_probe(struct platform_device *pdev)
if (ret) if (ret)
goto out; goto out;
host->present = host->pdata->card_present(mmc_dev(mmc)); if (host->pdata && host->pdata->card_present)
host->present = host->pdata->card_present(mmc_dev(mmc));
else /* if there is no way to detect assume that card is present */
host->present = 1;
init_timer(&host->timer); init_timer(&host->timer);
host->timer.data = (unsigned long)host; host->timer.data = (unsigned long)host;
host->timer.function = imxmci_check_status; host->timer.function = imxmci_check_status;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment