soc.lore.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] bus: ixp4xx: return on error in ixp4xx_exp_probe()
@ 2021-08-07 23:00 Linus Walleij
  2021-08-07 23:00 ` Linus Walleij
  2021-08-12 20:44 ` Arnd Bergmann
  0 siblings, 2 replies; 4+ messages in thread
From: Linus Walleij @ 2021-08-07 23:00 UTC (permalink / raw)
  To: arm, soc; +Cc: linux-arm-kernel, Dan Carpenter, Linus Walleij

From: Dan Carpenter <dan.carpenter@oracle.com>

This code was intended to return an error code if regmap_read() fails
but the return statement was missing.

Fixes: 1c953bda90ca ("bus: ixp4xx: Add a driver for IXP4xx expansion bus")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---
SoC maintainers: please apply this to the same branch where the
bus changes in the pull request "ixp4xx-drivers-arm-soc-v5.15-1"
was pulled in.
---
 drivers/bus/intel-ixp4xx-eb.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/bus/intel-ixp4xx-eb.c b/drivers/bus/intel-ixp4xx-eb.c
index 9acd00da413c..a4388440aca7 100644
--- a/drivers/bus/intel-ixp4xx-eb.c
+++ b/drivers/bus/intel-ixp4xx-eb.c
@@ -369,7 +369,7 @@ static int ixp4xx_exp_probe(struct platform_device *pdev)
 	/* We check that the regmap work only on first read */
 	ret = regmap_read(eb->rmap, IXP4XX_EXP_CNFG0, &val);
 	if (ret)
-		dev_err_probe(dev, ret, "cannot read regmap\n");
+		return dev_err_probe(dev, ret, "cannot read regmap\n");
 	if (val & IXP4XX_EXP_CNFG0_MEM_MAP)
 		eb->bus_base = IXP4XX_EXP_BOOT_BASE;
 	else
-- 
2.31.1


^ permalink raw reply	[flat|nested] 4+ messages in thread

* [PATCH] bus: ixp4xx: return on error in ixp4xx_exp_probe()
  2021-08-07 23:00 [PATCH] bus: ixp4xx: return on error in ixp4xx_exp_probe() Linus Walleij
@ 2021-08-07 23:00 ` Linus Walleij
  2021-08-12 20:44 ` Arnd Bergmann
  1 sibling, 0 replies; 4+ messages in thread
From: Linus Walleij @ 2021-08-07 23:00 UTC (permalink / raw)
  To: arm, soc; +Cc: linux-arm-kernel, Dan Carpenter, Linus Walleij

From: Dan Carpenter <dan.carpenter@oracle.com>

This code was intended to return an error code if regmap_read() fails
but the return statement was missing.

Fixes: 1c953bda90ca ("bus: ixp4xx: Add a driver for IXP4xx expansion bus")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---
SoC maintainers: please apply this to the same branch where the
bus changes in the pull request "ixp4xx-drivers-arm-soc-v5.15-1"
was pulled in.
---
 drivers/bus/intel-ixp4xx-eb.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/bus/intel-ixp4xx-eb.c b/drivers/bus/intel-ixp4xx-eb.c
index 9acd00da413c..a4388440aca7 100644
--- a/drivers/bus/intel-ixp4xx-eb.c
+++ b/drivers/bus/intel-ixp4xx-eb.c
@@ -369,7 +369,7 @@ static int ixp4xx_exp_probe(struct platform_device *pdev)
 	/* We check that the regmap work only on first read */
 	ret = regmap_read(eb->rmap, IXP4XX_EXP_CNFG0, &val);
 	if (ret)
-		dev_err_probe(dev, ret, "cannot read regmap\n");
+		return dev_err_probe(dev, ret, "cannot read regmap\n");
 	if (val & IXP4XX_EXP_CNFG0_MEM_MAP)
 		eb->bus_base = IXP4XX_EXP_BOOT_BASE;
 	else
-- 
2.31.1


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH] bus: ixp4xx: return on error in ixp4xx_exp_probe()
  2021-08-07 23:00 [PATCH] bus: ixp4xx: return on error in ixp4xx_exp_probe() Linus Walleij
  2021-08-07 23:00 ` Linus Walleij
@ 2021-08-12 20:44 ` Arnd Bergmann
  2021-08-12 20:44   ` Arnd Bergmann
  1 sibling, 1 reply; 4+ messages in thread
From: Arnd Bergmann @ 2021-08-12 20:44 UTC (permalink / raw)
  To: soc, Linus Walleij, arm; +Cc: Arnd Bergmann, linux-arm-kernel, Dan Carpenter

From: Arnd Bergmann <arnd@arndb.de>

On Sun, 8 Aug 2021 01:00:16 +0200, Linus Walleij wrote:
> This code was intended to return an error code if regmap_read() fails
> but the return statement was missing.

Applied to arm/drivers, thanks!

[1/1] bus: ixp4xx: return on error in ixp4xx_exp_probe()
      commit: d2c334f49c8305ff8ce31ea33183977a2935ba55

       Arnd

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH] bus: ixp4xx: return on error in ixp4xx_exp_probe()
  2021-08-12 20:44 ` Arnd Bergmann
@ 2021-08-12 20:44   ` Arnd Bergmann
  0 siblings, 0 replies; 4+ messages in thread
From: Arnd Bergmann @ 2021-08-12 20:44 UTC (permalink / raw)
  To: soc, Linus Walleij, arm; +Cc: Arnd Bergmann, linux-arm-kernel, Dan Carpenter

From: Arnd Bergmann <arnd@arndb.de>

On Sun, 8 Aug 2021 01:00:16 +0200, Linus Walleij wrote:
> This code was intended to return an error code if regmap_read() fails
> but the return statement was missing.

Applied to arm/drivers, thanks!

[1/1] bus: ixp4xx: return on error in ixp4xx_exp_probe()
      commit: d2c334f49c8305ff8ce31ea33183977a2935ba55

       Arnd

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2021-08-12 20:49 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-08-07 23:00 [PATCH] bus: ixp4xx: return on error in ixp4xx_exp_probe() Linus Walleij
2021-08-07 23:00 ` Linus Walleij
2021-08-12 20:44 ` Arnd Bergmann
2021-08-12 20:44   ` Arnd Bergmann

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).