diff options
author | Jakub Kicinski <kuba@kernel.org> | 2021-09-16 22:58:38 +0200 |
---|---|---|
committer | Jakub Kicinski <kuba@kernel.org> | 2021-09-16 22:58:38 +0200 |
commit | 561bed688bffedd6bbdfa70af7a4f64f0a3e2140 (patch) | |
tree | 19256b7a70dcdb9a95c4a7494a0b8bb9db10ef30 /drivers/virtio/virtio_balloon.c | |
parent | octeontx2-af: Hardware configuration for inline IPsec (diff) | |
parent | Merge tag 'net-5.15-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/net... (diff) | |
download | linux-561bed688bffedd6bbdfa70af7a4f64f0a3e2140.tar.xz linux-561bed688bffedd6bbdfa70af7a4f64f0a3e2140.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
No conflicts!
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'drivers/virtio/virtio_balloon.c')
-rw-r--r-- | drivers/virtio/virtio_balloon.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/virtio/virtio_balloon.c b/drivers/virtio/virtio_balloon.c index 47dce91f788c..c22ff0117b46 100644 --- a/drivers/virtio/virtio_balloon.c +++ b/drivers/virtio/virtio_balloon.c @@ -531,8 +531,8 @@ static int init_vqs(struct virtio_balloon *vb) callbacks[VIRTIO_BALLOON_VQ_REPORTING] = balloon_ack; } - err = vb->vdev->config->find_vqs(vb->vdev, VIRTIO_BALLOON_VQ_MAX, - vqs, callbacks, names, NULL, NULL); + err = virtio_find_vqs(vb->vdev, VIRTIO_BALLOON_VQ_MAX, vqs, + callbacks, names, NULL); if (err) return err; |