FAILED: patch "[PATCH] usb: typec: tcpci_rt1711h: unregister TCPCI port with devres" failed to apply to 6.1-stable tree
Subsystems (3)
[email protected]
maintainerThe patch below does not apply to the 6.1-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.1.y
git checkout FETCH_HEAD
git cherry-pick -x e8da46d99d3710106e7c44db14566bf9b57386b5
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2026071334-divinely-dingbat-9c54@gregkh' --subject-prefix 'PATCH 6.1.y' 'HEAD^..'
Possible dependencies:
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From e8da46d99d3710106e7c44db14566bf9b57386b5 Mon Sep 17 00:00:00 2001
From: Myeonghun Pak <[email protected]>
Date: Mon, 6 Jul 2026 23:53:12 +0900
Subject: [PATCH] usb: typec: tcpci_rt1711h: unregister TCPCI port with devres
rt1711h_probe() registers the TCPCI port before requesting the interrupt and enabling alert interrupts. If either of those later steps fails, the probe function returns without unregistering the TCPCI port. The explicit unregister currently only happens from the remove callback.
Register a devres action immediately after tcpci_register_port() succeeds, so tcpci_unregister_port() runs on later probe failures and on driver detach. Drop the remove callback to avoid unregistering the same port twice.
This issue was identified during our ongoing static-analysis research while reviewing kernel code.
drivers/usb/typec/tcpm/tcpci_rt1711h.c +8 -5
@@ -295,6 +295,8 @@ static int rt1711h_sw_reset(struct rt1711h_chip *chip)return 0 ; } +static void rt1711h_unregister_tcpci_port (void *tcpci); +static int rt1711h_probe (struct i2c_client *client) {int ret;
@@ -340,6 +342,10 @@ static int rt1711h_probe(struct i2c_client *client)if (IS_ERR_OR_NULL (chip->tcpci))return PTR_ERR (chip->tcpci); + ret =devm_add_action_or_reset (chip->dev, rt1711h_unregister_tcpci_port, chip->tcpci); +if (ret) +return ret; + ret = devm_request_threaded_irq(chip->dev, client->irq, NULL, rt1711h_irq, IRQF_ONESHOT | IRQF_TRIGGER_LOW,
@@ -357,11 +363,9 @@ static int rt1711h_probe(struct i2c_client *client)return 0 ; } -static void rt1711h_remove (struct i2c_client *client) +static void rt1711h_unregister_tcpci_port (void *tcpci) { -struct rt1711h_chip *chip =i2c_get_clientdata (client); - -tcpci_unregister_port (chip->tcpci); +tcpci_unregister_port (tcpci); }static const struct rt1711h_chip_info rt1711h = {
@@ -394,7 +398,6 @@ static struct i2c_driver rt1711h_i2c_driver = { .of_match_table = rt1711h_of_match, }, .probe = rt1711h_probe, - .remove = rt1711h_remove, .id_table = rt1711h_id, };module_i2c_driver (rt1711h_i2c_driver);
Sasha Levin
maintainerPATCH 1/1 usb: typec: tcpci_rt1711h: unregister TCPCI port with devres
From: Myeonghun Pak <[email protected]>
[ Upstream commit e8da46d99d3710106e7c44db14566bf9b57386b5 ]
rt1711h_probe() registers the TCPCI port before requesting the interrupt and enabling alert interrupts. If either of those later steps fails, the probe function returns without unregistering the TCPCI port. The explicit unregister currently only happens from the remove callback.
Register a devres action immediately after tcpci_register_port() succeeds, so tcpci_unregister_port() runs on later probe failures and on driver detach. Drop the remove callback to avoid unregistering the same port twice.
This issue was identified during our ongoing static-analysis research while reviewing kernel code.
--- drivers/usb/typec/tcpm/tcpci_rt1711h.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-)
drivers/usb/typec/tcpm/tcpci_rt1711h.c +8 -5
@@ -327,6 +327,8 @@ static int rt1711h_check_revision(struct i2c_client *i2c, struct rt1711h_chip *creturn ret; } +static void rt1711h_unregister_tcpci_port (void *tcpci); +static int rt1711h_probe (struct i2c_client *client,const struct i2c_device_id *i2c_id) {
@@ -379,6 +381,10 @@ static int rt1711h_probe(struct i2c_client *client,if (IS_ERR_OR_NULL (chip->tcpci))return PTR_ERR (chip->tcpci); + ret =devm_add_action_or_reset (chip->dev, rt1711h_unregister_tcpci_port, chip->tcpci); +if (ret) +return ret; + ret = devm_request_threaded_irq(chip->dev, client->irq, NULL, rt1711h_irq, IRQF_ONESHOT | IRQF_TRIGGER_LOW,
@@ -396,11 +402,9 @@ static int rt1711h_probe(struct i2c_client *client,return 0 ; } -static void rt1711h_remove (struct i2c_client *client) +static void rt1711h_unregister_tcpci_port (void *tcpci) { -struct rt1711h_chip *chip =i2c_get_clientdata (client); - -tcpci_unregister_port (chip->tcpci); +tcpci_unregister_port (tcpci); }static const struct i2c_device_id rt1711h_id[] = {
@@ -425,7 +429,6 @@ static struct i2c_driver rt1711h_i2c_driver = { .of_match_table = of_match_ptr(rt1711h_of_match), }, .probe = rt1711h_probe, - .remove = rt1711h_remove, .id_table = rt1711h_id, };module_i2c_driver (rt1711h_i2c_driver);
Signature · 1 line
2.53.0