Merge tag 'acpi-5.15-rc1-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...

[linux-2.6-microblaze.git] / drivers / dma / idxd / cdev.c

diff --git a/drivers/dma/idxd/cdev.c b/drivers/dma/idxd/cdev.c
index f6a4603..b9b2b4a 100644 (file)
--- a/drivers/dma/idxd/cdev.c
+++ b/drivers/dma/idxd/cdev.c
@@ -218,14 +218,13 @@ static __poll_t idxd_cdev_poll(struct file *filp,
        struct idxd_user_context *ctx = filp->private_data;
        struct idxd_wq *wq = ctx->wq;
        struct idxd_device *idxd = wq->idxd;
-       unsigned long flags;
        __poll_t out = 0;
 
        poll_wait(filp, &wq->err_queue, wait);
-       spin_lock_irqsave(&idxd->dev_lock, flags);
+       spin_lock(&idxd->dev_lock);
        if (idxd->sw_err.valid)
                out = EPOLLIN | EPOLLRDNORM;
-       spin_unlock_irqrestore(&idxd->dev_lock, flags);
+       spin_unlock(&idxd->dev_lock);
 
        return out;
 }
@@ -320,9 +319,12 @@ static int idxd_user_drv_probe(struct idxd_dev *idxd_dev)
                goto err;
 
        rc = idxd_wq_add_cdev(wq);
-       if (rc < 0)
+       if (rc < 0) {
+               idxd->cmd_status = IDXD_SCMD_CDEV_ERR;
                goto err_cdev;
+       }
 
+       idxd->cmd_status = 0;
        mutex_unlock(&wq->wq_lock);
        return 0;