Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8b076738 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/egtvedt/linux-avr32 

Pull avr32 fix from Hans-Christian Egtvedt.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/egtvedt/linux-avr32:
  avr32: fix error return code
parents f536b3ca 686913aa

arch/avr32/boards/hammerhead/flash.c

+8 −3
Original line number Diff line number Diff line
@@ -190,14 +190,19 @@ static int __init hammerhead_usbh_init(void) 


	/* setup gclk0 to run from osc1 */

	gclk = clk_get(NULL, "gclk0");

	if (IS_ERR(gclk))

	if (IS_ERR(gclk)) {

		ret = PTR_ERR(gclk);

		goto err_gclk;

	}



	osc = clk_get(NULL, "osc1");

	if (IS_ERR(osc))

	if (IS_ERR(osc)) {

		ret = PTR_ERR(osc);

		goto err_osc;

	}



	if (clk_set_parent(gclk, osc)) {

	ret = clk_set_parent(gclk, osc);

	if (ret < 0) {

		pr_debug("hammerhead: failed to set osc1 for USBH clock\n");

		goto err_set_clk;

	}