diff options
| author | Alex Williamson <alex.williamson@redhat.com> | 2021-09-30 20:55:35 +0200 |
|---|---|---|
| committer | Alex Williamson <alex.williamson@redhat.com> | 2021-09-30 20:55:35 +0200 |
| commit | d9a0cd510c3383b61db6f70a84e0c3487f836a63 (patch) | |
| tree | 384270fd284d62726c9e1fbba8216cb5933e7898 /drivers/s390/crypto | |
| parent | Merge tag 'sound-5.15-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/t... (diff) | |
| parent | vfio/iommu_type1: remove IS_IOMMU_CAP_DOMAIN_IN_CONTAINER (diff) | |
| download | linux-d9a0cd510c3383b61db6f70a84e0c3487f836a63.tar.xz linux-d9a0cd510c3383b61db6f70a84e0c3487f836a63.zip | |
Merge branch 'v5.16/vfio/hch-cleanup-vfio-iommu_group-creation-v6' into v5.16/vfio/next
Diffstat (limited to 'drivers/s390/crypto')
| -rw-r--r-- | drivers/s390/crypto/vfio_ap_ops.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/s390/crypto/vfio_ap_ops.c b/drivers/s390/crypto/vfio_ap_ops.c index 623d5269a52c..2341425f6967 100644 --- a/drivers/s390/crypto/vfio_ap_ops.c +++ b/drivers/s390/crypto/vfio_ap_ops.c @@ -351,7 +351,7 @@ static int vfio_ap_mdev_probe(struct mdev_device *mdev) list_add(&matrix_mdev->node, &matrix_dev->mdev_list); mutex_unlock(&matrix_dev->lock); - ret = vfio_register_group_dev(&matrix_mdev->vdev); + ret = vfio_register_emulated_iommu_dev(&matrix_mdev->vdev); if (ret) goto err_list; dev_set_drvdata(&mdev->dev, matrix_mdev); |