git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'drm-misc-next-2020-10-27' of git://anongit.freedesktop.org/drm/drm-misc...
[sfrench/cifs-2.6.git]
/
drivers
/
misc
/
fastrpc.c
diff --git
a/drivers/misc/fastrpc.c
b/drivers/misc/fastrpc.c
index 994ab67bc2dce6cbb4d2216262a1825a1f7df350..70eb5ed942d036c71006a2187fdff08152eb9623 100644
(file)
--- a/
drivers/misc/fastrpc.c
+++ b/
drivers/misc/fastrpc.c
@@
-586,11
+586,13
@@
static void fastrpc_dma_buf_detatch(struct dma_buf *dmabuf,
kfree(a);
}
kfree(a);
}
-static
void *fastrpc_vmap(struct dma_buf *dmabuf
)
+static
int fastrpc_vmap(struct dma_buf *dmabuf, struct dma_buf_map *map
)
{
struct fastrpc_buf *buf = dmabuf->priv;
{
struct fastrpc_buf *buf = dmabuf->priv;
- return buf->virt;
+ dma_buf_map_set_vaddr(map, buf->virt);
+
+ return 0;
}
static int fastrpc_mmap(struct dma_buf *dmabuf,
}
static int fastrpc_mmap(struct dma_buf *dmabuf,