Merge 4.11-rc4 into tty-next

[karo-tx-linux.git] / drivers / tty / serial / 8250 / 8250_dw.c

diff --git a/drivers/tty/serial/8250/8250_dw.c b/drivers/tty/serial/8250/8250_dw.c
index e65808c482f1847d09d819a24defb0e5cf6508b5..787b1160d3a535aceafc40f742652deb9d5f2182 100644 (file)
--- a/drivers/tty/serial/8250/8250_dw.c
+++ b/drivers/tty/serial/8250/8250_dw.c
@@ -530,12 +530,11 @@ static int dw8250_probe(struct platform_device *pdev)
        }
 
        data->rst = devm_reset_control_get_optional(dev, NULL);
-       if (IS_ERR(data->rst) && PTR_ERR(data->rst) == -EPROBE_DEFER) {
-               err = -EPROBE_DEFER;
+       if (IS_ERR(data->rst)) {
+               err = PTR_ERR(data->rst);
                goto err_pclk;
        }
-       if (!IS_ERR(data->rst))
-               reset_control_deassert(data->rst);
+       reset_control_deassert(data->rst);
 
        dw8250_quirks(p, data);
 
@@ -567,8 +566,7 @@ static int dw8250_probe(struct platform_device *pdev)
        return 0;
 
 err_reset:
-       if (!IS_ERR(data->rst))
-               reset_control_assert(data->rst);
+       reset_control_assert(data->rst);
 
 err_pclk:
        if (!IS_ERR(data->pclk))
@@ -589,8 +587,7 @@ static int dw8250_remove(struct platform_device *pdev)
 
        serial8250_unregister_port(data->line);
 
-       if (!IS_ERR(data->rst))
-               reset_control_assert(data->rst);
+       reset_control_assert(data->rst);
 
        if (!IS_ERR(data->pclk))
                clk_disable_unprepare(data->pclk);