mirror of
https://github.com/torvalds/linux.git
synced 2026-05-30 10:04:04 +02:00
Merge branch 'for-7.0/cxl-misc' into cxl-for-next
cxl: Fix premature commit_end increment on decoder commit failure
This commit is contained in:
commit
63050be0bf
|
|
@ -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;
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user