diff options
| author | Emanuele Ghidoli <emanuele.ghidoli@toradex.com> | 2023-08-29 18:42:27 +0200 |
|---|---|---|
| committer | Emanuele Ghidoli <emanuele.ghidoli@toradex.com> | 2023-08-29 18:42:27 +0200 |
| commit | e9d770cf1d3448eadc124b32306674ad6087d96e (patch) | |
| tree | 34f6192c33ef2024475989ba3f124e1d37875500 /drivers/firmware | |
| parent | b1bc3e6015c6b1f18d695eb45a9512dde0105cf2 (diff) | |
| parent | b0ece631f84a3e70341496b000b094b7dfdf4e5f (diff) | |
Merge tag 'v5.15.111' into 5.15-2.2.x-imx
This is the 5.15.111 stable release
Diffstat (limited to 'drivers/firmware')
| -rw-r--r-- | drivers/firmware/arm_scmi/driver.c | 2 | ||||
| -rw-r--r-- | drivers/firmware/qcom_scm.c | 3 | ||||
| -rw-r--r-- | drivers/firmware/stratix10-svc.c | 4 |
3 files changed, 4 insertions, 5 deletions
diff --git a/drivers/firmware/arm_scmi/driver.c b/drivers/firmware/arm_scmi/driver.c index 11842497b226..7ccda7d720a1 100644 --- a/drivers/firmware/arm_scmi/driver.c +++ b/drivers/firmware/arm_scmi/driver.c @@ -1463,7 +1463,7 @@ static int scmi_xfer_info_init(struct scmi_info *sinfo) return ret; ret = __scmi_xfer_info_init(sinfo, &sinfo->tx_minfo); - if (!ret && idr_find(&sinfo->rx_idr, SCMI_PROTOCOL_BASE)) + if (!ret && !idr_is_empty(&sinfo->rx_idr)) ret = __scmi_xfer_info_init(sinfo, &sinfo->rx_minfo); return ret; diff --git a/drivers/firmware/qcom_scm.c b/drivers/firmware/qcom_scm.c index 2b5214d5c0da..18e1a4b80401 100644 --- a/drivers/firmware/qcom_scm.c +++ b/drivers/firmware/qcom_scm.c @@ -1320,8 +1320,7 @@ static int qcom_scm_probe(struct platform_device *pdev) static void qcom_scm_shutdown(struct platform_device *pdev) { /* Clean shutdown, disable download mode to allow normal restart */ - if (download_mode) - qcom_scm_set_download_mode(false); + qcom_scm_set_download_mode(false); } static const struct of_device_id qcom_scm_dt_match[] = { diff --git a/drivers/firmware/stratix10-svc.c b/drivers/firmware/stratix10-svc.c index 4fdd75f1e86e..2b50dc21fba1 100644 --- a/drivers/firmware/stratix10-svc.c +++ b/drivers/firmware/stratix10-svc.c @@ -989,8 +989,8 @@ static int stratix10_svc_drv_probe(struct platform_device *pdev) return ret; genpool = svc_create_memory_pool(pdev, sh_memory); - if (!genpool) - return -ENOMEM; + if (IS_ERR(genpool)) + return PTR_ERR(genpool); /* allocate service controller and supporting channel */ controller = devm_kzalloc(dev, sizeof(*controller), GFP_KERNEL); |