Merge drm/drm-next into drm-misc-next

[sfrench/cifs-2.6.git] / drivers / misc / fastrpc.c

diff --git a/drivers/misc/fastrpc.c b/drivers/misc/fastrpc.c
index 7ff0b63c25e376656b01d187c6acf698e56343c5..1ad5808655254b6e495d333929acdac4e32e9fab 100644 (file)
--- a/drivers/misc/fastrpc.c
+++ b/drivers/misc/fastrpc.c
@@ -310,8 +310,8 @@ static void fastrpc_free_map(struct kref *ref)
                                return;
                        }
                }
-               dma_buf_unmap_attachment(map->attach, map->table,
-                                        DMA_BIDIRECTIONAL);
+               dma_buf_unmap_attachment_unlocked(map->attach, map->table,
+                                                 DMA_BIDIRECTIONAL);
                dma_buf_detach(map->buf, map->attach);
                dma_buf_put(map->buf);
        }
@@ -726,7 +726,7 @@ static int fastrpc_map_create(struct fastrpc_user *fl, int fd,
                goto attach_err;
        }
 
-       map->table = dma_buf_map_attachment(map->attach, DMA_BIDIRECTIONAL);
+       map->table = dma_buf_map_attachment_unlocked(map->attach, DMA_BIDIRECTIONAL);
        if (IS_ERR(map->table)) {
                err = PTR_ERR(map->table);
                goto map_err;