diff options
author | Vignesh Raghavendra <vigneshr@ti.com> | 2023-02-16 15:41:14 +0530 |
---|---|---|
committer | Vignesh Raghavendra <vigneshr@ti.com> | 2023-02-16 15:41:14 +0530 |
commit | 8ffeeca907557f941a0dd873f3ad7a63d130b6fa (patch) | |
tree | f1629bee72e4adb24d64464dfbe911818023edfc /samples | |
parent | 76b3e88d569210a51399e8d8c8babd995af29d11 (diff) | |
parent | 179624a57b78c02de833370b7bdf0b0f4a27ca31 (diff) |
Merge tag 'v5.10.165' of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux into ti-linux-5.10.y-cicd
This is the 5.10.165 stable release
* tag 'v5.10.165' of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux: (951 commits)
Linux 5.10.165
io_uring/rw: remove leftover debug statement
io_uring/rw: ensure kiocb_end_write() is always called
io_uring: fix double poll leak on repolling
io_uring: Clean up a false-positive warning from GCC 9.3.0
mm/khugepaged: fix collapse_pte_mapped_thp() to allow anon_vma
Bluetooth: hci_qca: Fixed issue during suspend
Bluetooth: hci_qca: check for SSR triggered flag while suspend
Bluetooth: hci_qca: Wait for SSR completion during suspend
soc: qcom: apr: Make qcom,protection-domain optional again
Revert "wifi: mac80211: fix memory leak in ieee80211_if_add()"
net/mlx5: fix missing mutex_unlock in mlx5_fw_fatal_reporter_err_work()
net/ulp: use consistent error code when blocking ULP
io_uring/net: fix fast_iov assignment in io_setup_async_msg()
io_uring: io_kiocb_update_pos() should not touch file for non -1 offset
tracing: Use alignof__(struct {type b;}) instead of offsetof()
x86/fpu: Use _Alignof to avoid undefined behavior in TYPE_ALIGN
Revert "drm/amdgpu: make display pinning more flexible (v2)"
efi: rt-wrapper: Add missing include
arm64: efi: Execute runtime services from a dedicated stack
...
Signed-off-by: Vignesh Raghavendra <vigneshr@ti.com>
# Conflicts:
# net/hsr/hsr_device.c
# net/hsr/hsr_forward.c
Diffstat (limited to 'samples')
-rw-r--r-- | samples/vfio-mdev/mdpy-fb.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/samples/vfio-mdev/mdpy-fb.c b/samples/vfio-mdev/mdpy-fb.c index 9ec93d90e8a5..4eb7aa11cfbb 100644 --- a/samples/vfio-mdev/mdpy-fb.c +++ b/samples/vfio-mdev/mdpy-fb.c @@ -109,7 +109,7 @@ static int mdpy_fb_probe(struct pci_dev *pdev, ret = pci_request_regions(pdev, "mdpy-fb"); if (ret < 0) - return ret; + goto err_disable_dev; pci_read_config_dword(pdev, MDPY_FORMAT_OFFSET, &format); pci_read_config_dword(pdev, MDPY_WIDTH_OFFSET, &width); @@ -191,6 +191,9 @@ err_release_fb: err_release_regions: pci_release_regions(pdev); +err_disable_dev: + pci_disable_device(pdev); + return ret; } @@ -199,7 +202,10 @@ static void mdpy_fb_remove(struct pci_dev *pdev) struct fb_info *info = pci_get_drvdata(pdev); unregister_framebuffer(info); + iounmap(info->screen_base); framebuffer_release(info); + pci_release_regions(pdev); + pci_disable_device(pdev); } static struct pci_device_id mdpy_fb_pci_table[] = { |