From 26e4bd971184a0ba0b1785c22f295f6c2cb86d6a Mon Sep 17 00:00:00 2001 From: Kevin Hilman Date: Wed, 11 Jul 2012 17:51:40 +0100 Subject: [PATCH] --- yaml --- r: 321133 b: refs/heads/master c: 04e8c7bc2c1eda2d06ff6eb57a7df97e64d895e6 h: refs/heads/master i: 321131: 1cad9fbeb0202a3fdb631412dbc5a7a053ecc15a v: v3 --- [refs] | 2 +- trunk/drivers/mmc/host/omap_hsmmc.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index e1ac5e98303d..7663fe10d674 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4e1755bbb4857ea4c5a5e12927cbc04e843cb4d4 +refs/heads/master: 04e8c7bc2c1eda2d06ff6eb57a7df97e64d895e6 diff --git a/trunk/drivers/mmc/host/omap_hsmmc.c b/trunk/drivers/mmc/host/omap_hsmmc.c index 2338703746a4..823d21cb87c0 100644 --- a/trunk/drivers/mmc/host/omap_hsmmc.c +++ b/trunk/drivers/mmc/host/omap_hsmmc.c @@ -1924,12 +1924,14 @@ static int __devinit omap_hsmmc_probe(struct platform_device *pdev) host->rx_chan = dma_request_channel(mask, omap_dma_filter_fn, &rx_req); if (!host->rx_chan) { dev_err(mmc_dev(host->mmc), "unable to obtain RX DMA engine channel %u\n", rx_req); + ret = -ENXIO; goto err_irq; } host->tx_chan = dma_request_channel(mask, omap_dma_filter_fn, &tx_req); if (!host->tx_chan) { dev_err(mmc_dev(host->mmc), "unable to obtain TX DMA engine channel %u\n", tx_req); + ret = -ENXIO; goto err_irq; }