Merge remote-tracking branch 'rcu/rcu/next'

[karo-tx-linux.git] / drivers / mmc / host / omap_hsmmc.c

diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
index b6639ea0bf18dbd37ccf0d639073119353b418b6..43097a76399cde95a813f7aa6ffb6a4dc275ca07 100644 (file)
--- a/drivers/mmc/host/omap_hsmmc.c
+++ b/drivers/mmc/host/omap_hsmmc.c
@@ -503,8 +503,11 @@ static int omap_hsmmc_reg_get(struct omap_hsmmc_host *host)
        host->pbias = devm_regulator_get_optional(host->dev, "pbias");
        if (IS_ERR(host->pbias)) {
                ret = PTR_ERR(host->pbias);
-               if ((ret != -ENODEV) && host->dev->of_node)
+               if ((ret != -ENODEV) && host->dev->of_node) {
+                       dev_err(host->dev,
+                       "SD card detect fail? enable CONFIG_REGULATOR_PBIAS\n");
                        return ret;
+               }
                dev_dbg(host->dev, "unable to get pbias regulator %ld\n",
                        PTR_ERR(host->pbias));
                host->pbias = NULL;
@@ -2159,7 +2162,7 @@ static int omap_hsmmc_probe(struct platform_device *pdev)
                                                 &rx_req, &pdev->dev, "rx");
 
        if (!host->rx_chan) {
-               dev_err(mmc_dev(host->mmc), "unable to obtain RX DMA engine channel %u\n", rx_req);
+               dev_err(mmc_dev(host->mmc), "unable to obtain RX DMA engine channel\n");
                ret = -ENXIO;
                goto err_irq;
        }
@@ -2169,7 +2172,7 @@ static int omap_hsmmc_probe(struct platform_device *pdev)
                                                 &tx_req, &pdev->dev, "tx");
 
        if (!host->tx_chan) {
-               dev_err(mmc_dev(host->mmc), "unable to obtain TX DMA engine channel %u\n", tx_req);
+               dev_err(mmc_dev(host->mmc), "unable to obtain TX DMA engine channel\n");
                ret = -ENXIO;
                goto err_irq;
        }