diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-10-30 13:40:39 +0300 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-10-30 13:40:39 +0300 |
commit | cbfff98a623df8d4e7c02d63d6448220cf0aec7c (patch) | |
tree | 1a02766ada2b9be9745d6028f80a801eff5b358a /drivers/misc/cxl/pci.c | |
parent | b65fba3d87216bfe6ae9bc77be5eb6eabb6514a4 (diff) | |
parent | a909d3e636995ba7c349e2ca5dbb528154d4ac30 (diff) | |
download | linux-cbfff98a623df8d4e7c02d63d6448220cf0aec7c.tar.xz |
Merge 4.9-rc3 into usb-next
We want the USB fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/misc/cxl/pci.c')
-rw-r--r-- | drivers/misc/cxl/pci.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/misc/cxl/pci.c b/drivers/misc/cxl/pci.c index 7afad8477ad5..e96be9ca4e60 100644 --- a/drivers/misc/cxl/pci.c +++ b/drivers/misc/cxl/pci.c @@ -1487,6 +1487,8 @@ static int cxl_configure_adapter(struct cxl *adapter, struct pci_dev *dev) if ((rc = cxl_native_register_psl_err_irq(adapter))) goto err; + /* Release the context lock as adapter is configured */ + cxl_adapter_context_unlock(adapter); return 0; err: |