averello/linux-stable-mirror
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2026-09-22 09:34:56 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'irq/urgent' into irq/drivers

Browse Source 
to fixup a trivial conflict with pending upstream fixes.
This commit is contained in:
Thomas Gleixner
2026-03-26 16:14:33 +01:00
parent 1f0cf05155 897cf98926
commit 87c6dfe308
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/irqchip/irq-qcom-mpm.c
+3
View File
@@ -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);
drivers/irqchip/irq-renesas-rzv2h.c
+1 -2
View File
@@ -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;
}