Skip to content

Commit 63050be

Browse files
committed
Merge branch 'for-7.0/cxl-misc' into cxl-for-next
cxl: Fix premature commit_end increment on decoder commit failure
2 parents 3f7938b + 7b6f9d9 commit 63050be

1 file changed

Lines changed: 1 addition & 2 deletions

File tree

drivers/cxl/core/hdm.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -844,14 +844,13 @@ static int cxl_decoder_commit(struct cxl_decoder *cxld)
844844
scoped_guard(rwsem_read, &cxl_rwsem.dpa)
845845
setup_hw_decoder(cxld, hdm);
846846

847-
port->commit_end++;
848847
rc = cxld_await_commit(hdm, cxld->id);
849848
if (rc) {
850849
dev_dbg(&port->dev, "%s: error %d committing decoder\n",
851850
dev_name(&cxld->dev), rc);
852-
cxld->reset(cxld);
853851
return rc;
854852
}
853+
port->commit_end++;
855854
cxld->flags |= CXL_DECODER_F_ENABLE;
856855

857856
return 0;

0 commit comments

Comments
 (0)