diff options
| author | Dave Jiang <dave.jiang@intel.com> | 2026-01-30 09:06:01 -0700 |
|---|---|---|
| committer | Dave Jiang <dave.jiang@intel.com> | 2026-01-30 09:06:01 -0700 |
| commit | 63050be0bfe0b280cce5d701b31940fd84858609 (patch) | |
| tree | 3b53a53535281c90192791b8f4a1e34b2cdca2ab /drivers/cxl | |
| parent | 3f7938b1aec7f06d5b23adca83e4542fcf027001 (diff) | |
| parent | 7b6f9d9b1ea05c9c22570126547c780e8c6c3f62 (diff) | |
Merge branch 'for-7.0/cxl-misc' into cxl-for-next
cxl: Fix premature commit_end increment on decoder commit failure
Diffstat (limited to 'drivers/cxl')
| -rw-r--r-- | drivers/cxl/core/hdm.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/cxl/core/hdm.c b/drivers/cxl/core/hdm.c index 6e516c69b2d2..1097de03a2bb 100644 --- a/drivers/cxl/core/hdm.c +++ b/drivers/cxl/core/hdm.c @@ -844,14 +844,13 @@ static int cxl_decoder_commit(struct cxl_decoder *cxld) scoped_guard(rwsem_read, &cxl_rwsem.dpa) setup_hw_decoder(cxld, hdm); - port->commit_end++; rc = cxld_await_commit(hdm, cxld->id); if (rc) { dev_dbg(&port->dev, "%s: error %d committing decoder\n", dev_name(&cxld->dev), rc); - cxld->reset(cxld); return rc; } + port->commit_end++; cxld->flags |= CXL_DECODER_F_ENABLE; return 0; |