fix unpaired rcu lock in prepend_path()

[~andy/linux] / drivers / uio / uio_pruss.c

diff --git a/drivers/uio/uio_pruss.c b/drivers/uio/uio_pruss.c
index f519da9034b7b5540b872fade72fd2391281fb80..96c4a19b19183b59bcd740053a7618e177b0907e 100644 (file)
--- a/drivers/uio/uio_pruss.c
+++ b/drivers/uio/uio_pruss.c
@@ -158,14 +158,12 @@ static int pruss_probe(struct platform_device *dev)
        if (pdata->sram_pool) {
                gdev->sram_pool = pdata->sram_pool;
                gdev->sram_vaddr =
-                       gen_pool_alloc(gdev->sram_pool, sram_pool_sz);
+                       (unsigned long)gen_pool_dma_alloc(gdev->sram_pool,
+                                       sram_pool_sz, &gdev->sram_paddr);
                if (!gdev->sram_vaddr) {
                        dev_err(&dev->dev, "Could not allocate SRAM pool\n");
                        goto out_free;
                }
-               gdev->sram_paddr =
-                       gen_pool_virt_to_phys(gdev->sram_pool,
-                                             gdev->sram_vaddr);
        }
 
        gdev->ddr_vaddr = dma_alloc_coherent(&dev->dev, extram_pool_sz,