diff options
author | Ingo Molnar <mingo@kernel.org> | 2019-04-26 12:01:33 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2019-04-26 12:01:33 +0200 |
commit | da398dbd7d871bae332a800f7d194af18a2a9058 (patch) | |
tree | 2dbdc51bd9caa1539480b3d80d082adfdb8179c3 /drivers/misc/fastrpc.c | |
parent | 2792107dc3af29ecc1a9b3dc5bc873dac4b61cd6 (diff) | |
parent | 8113a85f872003a9f5c58f9f143054b0d8ec73a5 (diff) | |
download | linux-da398dbd7d871bae332a800f7d194af18a2a9058.tar.gz linux-da398dbd7d871bae332a800f7d194af18a2a9058.tar.bz2 linux-da398dbd7d871bae332a800f7d194af18a2a9058.zip |
Merge branch 'linus' into x86/mm, to pick up dependent fix
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/misc/fastrpc.c')
-rw-r--r-- | drivers/misc/fastrpc.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/misc/fastrpc.c b/drivers/misc/fastrpc.c index 39f832d27288..36d0d5c9cfba 100644 --- a/drivers/misc/fastrpc.c +++ b/drivers/misc/fastrpc.c @@ -1184,6 +1184,7 @@ static int fastrpc_cb_probe(struct platform_device *pdev) struct fastrpc_session_ctx *sess; struct device *dev = &pdev->dev; int i, sessions = 0; + int rc; cctx = dev_get_drvdata(dev->parent); if (!cctx) @@ -1213,7 +1214,11 @@ static int fastrpc_cb_probe(struct platform_device *pdev) } cctx->sesscount++; spin_unlock(&cctx->lock); - dma_set_mask(dev, DMA_BIT_MASK(32)); + rc = dma_set_mask(dev, DMA_BIT_MASK(32)); + if (rc) { + dev_err(dev, "32-bit DMA enable failed\n"); + return rc; + } return 0; } |