Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-18 01:51:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

imxmmc: fix crash when no platform data is provided

Browse Source 
Don't crash if no platform data is provided.
In this case assume that card is present.

Signed-off-by: Paulius Zaleckas <paulius.zaleckas@teltonika.lt>
Acked-by: Pavel Pisa <pisa@cmp.felk.cvut.cz>
Signed-off-by: Pierre Ossman <drzeus@drzeus.cx>
This commit is contained in:
Paulius Zaleckas 2008-07-09 16:03:20 +03:00 committed by Pierre Ossman
parent 5fc63dfba8
commit c5d5e9c40f
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/mmc/host/imxmmc.c
View File

@ -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)
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)
if (ret) if (ret)
goto out; goto out;
if (host->pdata && host->pdata->card_present)
host->present = host->pdata->card_present(mmc_dev(mmc)); 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;