diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2025-03-10 07:31:51 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2025-03-10 07:31:51 +0100 |
| commit | 046cc01be6b9d139b49dfc396b7201c633ff1a26 (patch) | |
| tree | 529f902da1c2ef691ac83491547d816704ac1a83 /drivers/net/pse-pd/pse_core.c | |
| parent | 74fc34937d72d04e89e4f75ea66147cdc9b785f5 (diff) | |
| parent | 80e54e84911a923c40d7bee33a34c1b4be148d7a (diff) | |
Merge 6.14-rc6 into char-misc-next
We need the fixes in here as well to build on top of.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/net/pse-pd/pse_core.c')
| -rw-r--r-- | drivers/net/pse-pd/pse_core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/pse-pd/pse_core.c b/drivers/net/pse-pd/pse_core.c index 4f2a54afc4d0..4602e26eb8c8 100644 --- a/drivers/net/pse-pd/pse_core.c +++ b/drivers/net/pse-pd/pse_core.c @@ -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; |