regulator: core: regulator_lock_two() should test for EDEADLK not EDEADLOCK

Compare against -EDEADLK, which is what ww_mutex_lock() actually
returns and what every other deadlock check in this file already uses.

Function regulator_lock_two() acquires two regulators via
regulator_lock_nested() -> ww_mutex_lock().  On contention,
ww_mutex_lock() returns -EDEADLK, which is the caller's signal to drop
the lock it holds and retry the acquisition in the canonical order.

However, regulator_lock_two() tests the return value against -EDEADLOCK
rather than -EDEADLK.  On most architectures, EDEADLK and EDEADLOCK are
the same value, so the comparison happens to be correct and the bug is
invisible.  But on MIPS, SPARC, and PowerPC, those two errors have
different values.  The test is wrong: a genuine -EDEADLK backoff no
longer matches -EDEADLOCK, so instead of unlocking and retrying, the
code falls into WARN_ON(ret) and returns with only one of the two
regulators locked.

In practice, this is a bug only on MIPS, because the regulator core is
not built or used on the other two platforms.

In general, EDEADLK is preferred over EDEADLOCK for new code.

Fixes: cba6cfdc7c3f ("regulator: core: Avoid lockdep reports when resolving supplies")
Signed-off-by: Timur Tabi <ttabi@nvidia.com>
Link: https://patch.msgid.link/20260708235722.2953579-1-ttabi@nvidia.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index dc5d67767336e0bc24c35efba07b884b91cb4c20..1797929dfe56632e0fdda9e323c0e0c16c217d38 100644 (file)
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -248,7 +248,7 @@ static void regulator_lock_two(struct regulator_dev *rdev1,
        ret = regulator_lock_nested(rdev1, ww_ctx);
        WARN_ON(ret);
        ret = regulator_lock_nested(rdev2, ww_ctx);
-       if (ret != -EDEADLOCK) {
+       if (ret != -EDEADLK) {
                WARN_ON(ret);
                goto exit;
        }
@@ -264,7 +264,7 @@ static void regulator_lock_two(struct regulator_dev *rdev1,
                swap(held, contended);
                ret = regulator_lock_nested(contended, ww_ctx);
 
-               if (ret != -EDEADLOCK) {
+               if (ret != -EDEADLK) {
                        WARN_ON(ret);
                        break;
                }