diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-06-03 11:52:24 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-06-03 11:52:24 -0700 |
| commit | f88cd3fb9df228e5ce4e13ec3dbad671ddb2146e (patch) | |
| tree | fffbe448eca2db8af55106979a424bffec61b7f7 /drivers/vfio/platform | |
| parent | 143d28dcf23837a7e4c6a09e8ab369fdda81c0e7 (diff) | |
| parent | dc51ff91cf2d1e9a2d941da483602f71d4a51472 (diff) | |
| download | linux-f88cd3fb9df228e5ce4e13ec3dbad671ddb2146e.tar.bz2 | |
Merge tag 'vfio-v5.13-rc5' of git://github.com/awilliam/linux-vfio
Pull VFIO fixes from Alex Williamson:
- Fix error path return value (Zhen Lei)
- Add vfio-pci CONFIG_MMU dependency (Randy Dunlap)
- Replace open coding with struct_size() (Gustavo A. R. Silva)
- Fix sample driver error path (Wei Yongjun)
- Fix vfio-platform error path module_put() (Max Gurtovoy)
* tag 'vfio-v5.13-rc5' of git://github.com/awilliam/linux-vfio:
vfio/platform: fix module_put call in error flow
samples: vfio-mdev: fix error handing in mdpy_fb_probe()
vfio/iommu_type1: Use struct_size() for kzalloc()
vfio/pci: zap_vma_ptes() needs MMU
vfio/pci: Fix error return code in vfio_ecap_init()
Diffstat (limited to 'drivers/vfio/platform')
| -rw-r--r-- | drivers/vfio/platform/vfio_platform_common.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/vfio/platform/vfio_platform_common.c b/drivers/vfio/platform/vfio_platform_common.c index 361e5b57e369..470fcf7dac56 100644 --- a/drivers/vfio/platform/vfio_platform_common.c +++ b/drivers/vfio/platform/vfio_platform_common.c @@ -291,7 +291,7 @@ err_irq: vfio_platform_regions_cleanup(vdev); err_reg: mutex_unlock(&driver_lock); - module_put(THIS_MODULE); + module_put(vdev->parent_module); return ret; } |