diff options
| author | Oleksandr Suvorov <oleksandr.suvorov@toradex.com> | 2021-07-15 16:32:41 +0300 |
|---|---|---|
| committer | Oleksandr Suvorov <oleksandr.suvorov@toradex.com> | 2021-07-15 16:32:41 +0300 |
| commit | 55192fb3c2355a8251ab3adb8043c57f0ad010fa (patch) | |
| tree | 88ba6ca88a844f4999f7888943b01501b62d1b12 /drivers/crypto/qat/qat_c3xxxvf/adf_drv.c | |
| parent | 0560b5b704924e23c52772cc83c7b9e74537fb5f (diff) | |
| parent | 82ffbc138a1fc9076f55e626bd8352fc9a2ca9e9 (diff) | |
Merge tag 'v5.4.129' into toradex_5.4.y
This is the 5.4.129 stable release
Conflicts:
- drivers/i2c/busses/i2c-imx.c
Resolve the conflict between upstream commit ef456a2d ("i2c: imx: Simplify stopped state tracking")
and previously backported one ea3cc015 ("i2c: imx: implement master_xfer_atomic callback").
- drivers/usb/chipidea/ci_hdrc_imx.c
The upstream commit 4202cbbd ("usb: chipidea: ci_hdrc_imx: Pass DISABLE_DEVICE_STREAMING flag to imx6ul")
conflicts with the Toradex's fix 5c557731 ("usb: chipidea: imx: disable runtime pm for imx6ull").
Resolve the conflict.
Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>
Diffstat (limited to 'drivers/crypto/qat/qat_c3xxxvf/adf_drv.c')
| -rw-r--r-- | drivers/crypto/qat/qat_c3xxxvf/adf_drv.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/crypto/qat/qat_c3xxxvf/adf_drv.c b/drivers/crypto/qat/qat_c3xxxvf/adf_drv.c index 1dc5ac859f7b..bdd4e36763f1 100644 --- a/drivers/crypto/qat/qat_c3xxxvf/adf_drv.c +++ b/drivers/crypto/qat/qat_c3xxxvf/adf_drv.c @@ -233,12 +233,12 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent) if (ret) goto out_err_free_reg; - set_bit(ADF_STATUS_PF_RUNNING, &accel_dev->status); - ret = adf_dev_init(accel_dev); if (ret) goto out_err_dev_shutdown; + set_bit(ADF_STATUS_PF_RUNNING, &accel_dev->status); + ret = adf_dev_start(accel_dev); if (ret) goto out_err_dev_stop; |