Home Home > GIT Browse
diff options
authorMasahiro Yamada <yamada.masahiro@socionext.com>2017-12-27 14:21:05 +0900
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-02-03 17:39:22 +0100
commitaa33208b5a6f0014d9b7d966f61bd6c4f8cd9729 (patch)
parente00c5c771877abdb70814ce555f020deab42bd46 (diff)
serial: 8250_of: fix return code when probe function fails to get reset
commit b9820a31691b771db37afe2054dd3d3a680c1eed upstream. The error pointer from devm_reset_control_get_optional_shared() is not propagated. One of the most common problem scenarios is it returns -EPROBE_DEFER when the reset controller has not probed yet. In this case, the probe of the reset consumer should be deferred. Fixes: e2860e1f62f2 ("serial: 8250_of: Add reset support") Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Reviewed-by: Philipp Zabel <p.zabel@pengutronix.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/tty/serial/8250/8250_of.c b/drivers/tty/serial/8250/8250_of.c
index 1222c005fb98..951680640ad5 100644
--- a/drivers/tty/serial/8250/8250_of.c
+++ b/drivers/tty/serial/8250/8250_of.c
@@ -141,8 +141,11 @@ static int of_platform_serial_setup(struct platform_device *ofdev,
info->rst = devm_reset_control_get_optional_shared(&ofdev->dev, NULL);
- if (IS_ERR(info->rst))
+ if (IS_ERR(info->rst)) {
+ ret = PTR_ERR(info->rst);
goto err_dispose;
+ }
ret = reset_control_deassert(info->rst);
if (ret)
goto err_dispose;