diff options
| author | Thomas Gleixner <tglx@kernel.org> | 2026-03-26 18:14:33 +0300 |
|---|---|---|
| committer | Thomas Gleixner <tglx@kernel.org> | 2026-03-26 18:14:33 +0300 |
| commit | 87c6dfe308afb9d514006bb42ca2dad301f4ad75 (patch) | |
| tree | 889397d5742d29706e5bf715e5ff79391ca38746 | |
| parent | 1f0cf05155175849e2f747d26ef1d59e97e280db (diff) | |
| parent | 897cf98926429c8671a9009442883c2f62deae96 (diff) | |
| download | linux-87c6dfe308afb9d514006bb42ca2dad301f4ad75.tar.xz | |
Merge branch 'irq/urgent' into irq/drivers
to fixup a trivial conflict with pending upstream fixes.
| -rw-r--r-- | drivers/irqchip/irq-qcom-mpm.c | 3 | ||||
| -rw-r--r-- | drivers/irqchip/irq-renesas-rzv2h.c | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/drivers/irqchip/irq-qcom-mpm.c b/drivers/irqchip/irq-qcom-mpm.c index 83f31ea657b7..181320528a47 100644 --- a/drivers/irqchip/irq-qcom-mpm.c +++ b/drivers/irqchip/irq-qcom-mpm.c @@ -306,6 +306,8 @@ static int mpm_pd_power_off(struct generic_pm_domain *genpd) if (ret < 0) return ret; + mbox_client_txdone(priv->mbox_chan, 0); + return 0; } @@ -434,6 +436,7 @@ static int qcom_mpm_probe(struct platform_device *pdev, struct device_node *pare } priv->mbox_client.dev = dev; + priv->mbox_client.knows_txdone = true; priv->mbox_chan = mbox_request_channel(&priv->mbox_client, 0); if (IS_ERR(priv->mbox_chan)) { ret = PTR_ERR(priv->mbox_chan); diff --git a/drivers/irqchip/irq-renesas-rzv2h.c b/drivers/irqchip/irq-renesas-rzv2h.c index ce790590f7ca..31f191641ff8 100644 --- a/drivers/irqchip/irq-renesas-rzv2h.c +++ b/drivers/irqchip/irq-renesas-rzv2h.c @@ -884,8 +884,7 @@ static int rzv2h_icu_probe_common(struct platform_device *pdev, struct device_no return 0; pm_put: - pm_runtime_put(dev); - + pm_runtime_put_sync(dev); return ret; } |