diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2025-06-04 14:43:54 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2025-06-04 14:43:54 +0200 |
| commit | 8518546de40d414e7c5cc2bac2f98fdc1fe206b1 (patch) | |
| tree | 133863c9920af7237d5dec03f6d2159d8e1771f8 /drivers/dma | |
| parent | f9fe48bda7cfc6e11dc8ad817cb22c016fdaf8a9 (diff) | |
| parent | ba9210b8c96355a16b78e1b890dce78f284d6f31 (diff) | |
Merge v6.12.32
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/dma')
| -rw-r--r-- | drivers/dma/idxd/cdev.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/dma/idxd/cdev.c b/drivers/dma/idxd/cdev.c index 22aa2bab3693c..19a58c4ecef3f 100644 --- a/drivers/dma/idxd/cdev.c +++ b/drivers/dma/idxd/cdev.c @@ -225,7 +225,7 @@ static int idxd_cdev_open(struct inode *inode, struct file *filp) struct idxd_wq *wq; struct device *dev, *fdev; int rc = 0; - struct iommu_sva *sva; + struct iommu_sva *sva = NULL; unsigned int pasid; struct idxd_cdev *idxd_cdev; @@ -322,7 +322,7 @@ failed_set_pasid: if (device_user_pasid_enabled(idxd)) idxd_xa_pasid_remove(ctx); failed_get_pasid: - if (device_user_pasid_enabled(idxd)) + if (device_user_pasid_enabled(idxd) && !IS_ERR_OR_NULL(sva)) iommu_sva_unbind_device(sva); failed: mutex_unlock(&wq->wq_lock); |