diff options
| author | Vinod Koul <vkoul@kernel.org> | 2022-01-05 08:18:05 +0100 |
|---|---|---|
| committer | Vinod Koul <vkoul@kernel.org> | 2022-01-05 08:18:05 +0100 |
| commit | 5cb664fbeba0a11592c1d2774833a4cc49d1ca19 (patch) | |
| tree | f5eb47d25d0b90cebbe46d0cbe33bf39bc339eef /drivers/dma/idxd/irq.c | |
| parent | dmaengine: uniphier-xdmac: Fix type of address variables (diff) | |
| parent | dmaengine: st_fdma: fix MODULE_ALIAS (diff) | |
| download | linux-5cb664fbeba0a11592c1d2774833a4cc49d1ca19.tar.xz linux-5cb664fbeba0a11592c1d2774833a4cc49d1ca19.zip | |
Merge branch 'fixes' into next
We have a conflict in idxd driver between 'fixes' and 'next' and there
are patches dependent on this so, merge the 'fixes' branch into next
Diffstat (limited to 'drivers/dma/idxd/irq.c')
| -rw-r--r-- | drivers/dma/idxd/irq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/dma/idxd/irq.c b/drivers/dma/idxd/irq.c index 0b0055a0ad2a..925171e9738c 100644 --- a/drivers/dma/idxd/irq.c +++ b/drivers/dma/idxd/irq.c @@ -318,10 +318,10 @@ halt: INIT_WORK(&idxd->work, idxd_device_reinit); queue_work(idxd->wq, &idxd->work); } else { - spin_lock(&idxd->dev_lock); idxd->state = IDXD_DEV_HALTED; idxd_wqs_quiesce(idxd); idxd_wqs_unmap_portal(idxd); + spin_lock(&idxd->dev_lock); idxd_device_clear_state(idxd); dev_err(&idxd->pdev->dev, "idxd halted, need %s.\n", |