projects
/
platform
/
kernel
/
linux-rpi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge 6.3-rc5 into driver-core-next
[platform/kernel/linux-rpi.git]
/
drivers
/
vhost
/
vdpa.c
diff --git
a/drivers/vhost/vdpa.c
b/drivers/vhost/vdpa.c
index
7be9d9d
..
135ad39
100644
(file)
--- a/
drivers/vhost/vdpa.c
+++ b/
drivers/vhost/vdpa.c
@@
-1140,7
+1140,7
@@
static int vhost_vdpa_alloc_domain(struct vhost_vdpa *v)
struct vdpa_device *vdpa = v->vdpa;
const struct vdpa_config_ops *ops = vdpa->config;
struct device *dma_dev = vdpa_get_dma_dev(vdpa);
- struct bus_type *bus;
+
const
struct bus_type *bus;
int ret;
/* Device want to do DMA by itself */