Commit d721f9bb authored Apr 24, 2017 by Tobias Klauser Committed by Greg Kroah-Hartman Apr 26, 2017

fpga altera-hps2fpga: disable/unprepare clock on error in alt_fpga_bridge_probe()



If either _alt_hps2fpga_enable_set() or fpga_bridge_register() fail in
alt_fpga_bridge_probe(), the clock remains enabled and prepared. Also,
in the error path for _alt_hps2fpga_enable_set() a call to
fpga_bridge_unregister() is made even though the bridge was not
registered yet.

Remove the unnecessary call to fpga_bridge_unregister() and call
clk_disable_unprepare() in both error paths in order to make sure the
clock gets properly disabled and unprepared.

Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
Acked-by: Moritz Fischer <mdf@kernel.org>
Signed-off-by: Alan Tull <atull@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 139752a2

drivers/fpga/altera-hps2fpga.c

+9 −6

Original line number	Diff line number	Diff line
		@@ -181,15 +181,18 @@ static int alt_fpga_bridge_probe(struct platform_device *pdev)
		(enable ? "enabling" : "disabling"));

		ret = _alt_hps2fpga_enable_set(priv, enable);
		if (ret) {
		fpga_bridge_unregister(&pdev->dev);
		return ret;
		}
		if (ret)
		goto err;
		}
		}

		return fpga_bridge_register(dev, priv->name, &altera_hps2fpga_br_ops,
		ret = fpga_bridge_register(dev, priv->name, &altera_hps2fpga_br_ops,
		priv);
		err:
		if (ret)
		clk_disable_unprepare(priv->clk);

		return ret;
		}

		static int alt_fpga_bridge_remove(struct platform_device *pdev)