bybrooklyn/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-04-18 06:44:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

BackMerge tag 'v7.0-rc6' into drm-next

Browse Source 
Linux 7.0-rc6

Requested by a few people on irc to resolve conflicts in other tress.

Signed-off-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
Dave Airlie
2026-03-31 07:47:05 +10:00
parent a51973c5df 7aaa8047ea
commit f6225b546d
669 changed files with 8467 additions and 3450 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/vfio/pci/vfio_pci_dmabuf.c
View File

@@ -316,11 +316,10 @@ int vfio_pci_core_feature_dma_buf(struct vfio_pci_core_device *vdev, u32 flags,
*/
ret = dma_buf_fd(priv->dmabuf, get_dma_buf.open_flags);
if (ret < 0)
goto err_dma_buf;
dma_buf_put(priv->dmabuf);
return ret;
err_dma_buf:
dma_buf_put(priv->dmabuf);
err_dev_put:
vfio_device_put_registration(&vdev->vdev);
err_free_phys: