[PATCH v1 1/1] regmap: mdio: Don't modify output if error happened

[PATCH v1 1/1] regmap: mdio: Don't modify output if error happened

[Andy Shevchenko]

regmap_mdio_read() breaks the principle of "no touch output till it's known
that the operation succeeds". Refactor it accordingly.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
 drivers/base/regmap/regmap-mdio.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/base/regmap/regmap-mdio.c b/drivers/base/regmap/regmap-mdio.c
index 5f18fe409f56..5ec208279913 100644
--- a/drivers/base/regmap/regmap-mdio.c
+++ b/drivers/base/regmap/regmap-mdio.c
@@ -11,9 +11,11 @@ static int regmap_mdio_read(void *context, unsigned int reg, unsigned int *val)
 	int ret;
 
 	ret = mdiobus_read(mdio_dev->bus, mdio_dev->addr, reg);
-	*val = ret & 0xffff;
+	if (ret < 0)
+		return ret;
 
-	return ret < 0 ? ret : 0;
+	*val = ret & 0xffff;
+	return 0;
 }
 
 static int regmap_mdio_write(void *context, unsigned int reg, unsigned int val)
-- 
2.30.2

Re: [PATCH v1 1/1] regmap: mdio: Don't modify output if error happened

[Mark Brown]

On Thu, 20 May 2021 15:05:18 +0300, Andy Shevchenko wrote:
> regmap_mdio_read() breaks the principle of "no touch output till it's known
> that the operation succeeds". Refactor it accordingly.

Applied to

   https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git for-next

Thanks!

[1/1] regmap: mdio: Don't modify output if error happened
      commit: e56360d6a119f531506658ea87238e48ad4c95c2

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.

Thanks,
Mark