[PATCH 3.16 131/217] mdio-sun4i: oops in error handling in probe

[Ben Hutchings]

3.16.35-rc1 review patch.  If anyone has any objections, please let me know.

------------------

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

commit 227f33beab746aeec4ef3305bd17b1d374df09e7 upstream.

We could end up dereferencing an error pointer when we call
regulator_disable().

Fixes: 4bdcb1dd9feb ('net: Add MDIO bus driver for the Allwinner EMAC')
Signed-off-by: Dan Carpenter <dan.carpen...@oracle.com>
Acked-by: Chen-Yu Tsai <w...@csie.org>
Signed-off-by: David S. Miller <da...@davemloft.net>
Signed-off-by: Ben Hutchings <b...@decadent.org.uk>
---
 drivers/net/phy/mdio-sun4i.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- a/drivers/net/phy/mdio-sun4i.c
+++ b/drivers/net/phy/mdio-sun4i.c
@@ -132,6 +132,7 @@ static int sun4i_mdio_probe(struct platf
                        return -EPROBE_DEFER;
 
                dev_info(&pdev->dev, "no regulator found\n");
+               data->regulator = NULL;
        } else {
                ret = regulator_enable(data->regulator);
                if (ret)
@@ -147,7 +148,8 @@ static int sun4i_mdio_probe(struct platf
        return 0;
 
 err_out_disable_regulator:
-       regulator_disable(data->regulator);
+       if (data->regulator)
+               regulator_disable(data->regulator);
 err_out_free_mdiobus:
        mdiobus_free(bus);
        return ret;