diff options
Diffstat (limited to 'drivers/mmc/host/davinci_mmc.c')
-rw-r--r-- | drivers/mmc/host/davinci_mmc.c | 23 |
1 files changed, 7 insertions, 16 deletions
diff --git a/drivers/mmc/host/davinci_mmc.c b/drivers/mmc/host/davinci_mmc.c index f8a96d652e9e..3946a0eb3a03 100644 --- a/drivers/mmc/host/davinci_mmc.c +++ b/drivers/mmc/host/davinci_mmc.c | |||
@@ -1264,13 +1264,15 @@ static int __init davinci_mmcsd_probe(struct platform_device *pdev) | |||
1264 | 1264 | ||
1265 | r = platform_get_resource(pdev, IORESOURCE_DMA, 0); | 1265 | r = platform_get_resource(pdev, IORESOURCE_DMA, 0); |
1266 | if (!r) | 1266 | if (!r) |
1267 | goto out; | 1267 | dev_warn(&pdev->dev, "RX DMA resource not specified\n"); |
1268 | host->rxdma = r->start; | 1268 | else |
1269 | host->rxdma = r->start; | ||
1269 | 1270 | ||
1270 | r = platform_get_resource(pdev, IORESOURCE_DMA, 1); | 1271 | r = platform_get_resource(pdev, IORESOURCE_DMA, 1); |
1271 | if (!r) | 1272 | if (!r) |
1272 | goto out; | 1273 | dev_warn(&pdev->dev, "TX DMA resource not specified\n"); |
1273 | host->txdma = r->start; | 1274 | else |
1275 | host->txdma = r->start; | ||
1274 | 1276 | ||
1275 | host->mem_res = mem; | 1277 | host->mem_res = mem; |
1276 | host->base = ioremap(mem->start, mem_size); | 1278 | host->base = ioremap(mem->start, mem_size); |
@@ -1488,18 +1490,7 @@ static struct platform_driver davinci_mmcsd_driver = { | |||
1488 | .id_table = davinci_mmc_devtype, | 1490 | .id_table = davinci_mmc_devtype, |
1489 | }; | 1491 | }; |
1490 | 1492 | ||
1491 | static int __init davinci_mmcsd_init(void) | 1493 | module_platform_driver_probe(davinci_mmcsd_driver, davinci_mmcsd_probe); |
1492 | { | ||
1493 | return platform_driver_probe(&davinci_mmcsd_driver, | ||
1494 | davinci_mmcsd_probe); | ||
1495 | } | ||
1496 | module_init(davinci_mmcsd_init); | ||
1497 | |||
1498 | static void __exit davinci_mmcsd_exit(void) | ||
1499 | { | ||
1500 | platform_driver_unregister(&davinci_mmcsd_driver); | ||
1501 | } | ||
1502 | module_exit(davinci_mmcsd_exit); | ||
1503 | 1494 | ||
1504 | MODULE_AUTHOR("Texas Instruments India"); | 1495 | MODULE_AUTHOR("Texas Instruments India"); |
1505 | MODULE_LICENSE("GPL"); | 1496 | MODULE_LICENSE("GPL"); |