]> www.infradead.org Git - users/willy/pagecache.git/commitdiff
net: pse-pd: Fix deadlock in current limit functions
authorKory Maincent <kory.maincent@bootlin.com>
Wed, 12 Feb 2025 15:17:51 +0000 (16:17 +0100)
committerJakub Kicinski <kuba@kernel.org>
Thu, 13 Feb 2025 18:00:39 +0000 (10:00 -0800)
Fix a deadlock in pse_pi_get_current_limit and pse_pi_set_current_limit
caused by consecutive mutex_lock calls. One in the function itself and
another in pse_pi_get_voltage.

Resolve the issue by using the unlocked version of pse_pi_get_voltage
instead.

Fixes: e0a5e2bba38a ("net: pse-pd: Use power limit at driver side instead of current limit")
Signed-off-by: Kory Maincent <kory.maincent@bootlin.com>
Link: https://patch.msgid.link/20250212151751.1515008-1-kory.maincent@bootlin.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/pse-pd/pse_core.c

index 4f2a54afc4d0924aa4131cec67746b6faff8ba81..4602e26eb8c8612d430aaa1ef0ccb608287cf53c 100644 (file)
@@ -319,7 +319,7 @@ static int pse_pi_get_current_limit(struct regulator_dev *rdev)
                goto out;
        mW = ret;
 
-       ret = pse_pi_get_voltage(rdev);
+       ret = _pse_pi_get_voltage(rdev);
        if (!ret) {
                dev_err(pcdev->dev, "Voltage null\n");
                ret = -ERANGE;
@@ -356,7 +356,7 @@ static int pse_pi_set_current_limit(struct regulator_dev *rdev, int min_uA,
 
        id = rdev_get_id(rdev);
        mutex_lock(&pcdev->lock);
-       ret = pse_pi_get_voltage(rdev);
+       ret = _pse_pi_get_voltage(rdev);
        if (!ret) {
                dev_err(pcdev->dev, "Voltage null\n");
                ret = -ERANGE;