diff options
| author | Greg Kroah-Hartman | 2019-04-21 23:14:47 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2019-04-21 23:14:47 +0200 |
| commit | 3a26172437bb5ecdf6921e3ae24730ef37d3c860 (patch) | |
| tree | 79b9aee78c58d0138ddf3f5c45ca3fcf35e07958 /drivers/misc/fastrpc.c | |
| parent | Merge tag 'misc-habanalabs-next-2019-04-19' of git://people.freedesktop.org/~... (diff) | |
| parent | Linux 5.1-rc6 (diff) | |
| download | kernel-qcow2-linux-3a26172437bb5ecdf6921e3ae24730ef37d3c860.tar.gz kernel-qcow2-linux-3a26172437bb5ecdf6921e3ae24730ef37d3c860.tar.xz kernel-qcow2-linux-3a26172437bb5ecdf6921e3ae24730ef37d3c860.zip | |
Merge 5.1-rc6 into char-misc-next
We want the fixes, and this resolves a merge error in the fastrpc
driver.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.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 c4cc8e53243d..98603e235cf0 100644 --- a/drivers/misc/fastrpc.c +++ b/drivers/misc/fastrpc.c @@ -1315,6 +1315,7 @@ static int fastrpc_cb_probe(struct platform_device *pdev) struct device *dev = &pdev->dev; int i, sessions = 0; unsigned long flags; + int rc; cctx = dev_get_drvdata(dev->parent); if (!cctx) @@ -1344,7 +1345,11 @@ static int fastrpc_cb_probe(struct platform_device *pdev) } cctx->sesscount++; spin_unlock_irqrestore(&cctx->lock, flags); - 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; } |