diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-07 09:01:25 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-07 09:01:25 -0700 |
| commit | 8b076738593244000c003111e67dba49bbbafab0 (patch) | |
| tree | afd5f6bac275adf50f45d416052abb25c4c84583 /arch/avr32 | |
| parent | f536b3cae84eb7c9f3495285ad048d13a397ed0b (diff) | |
| parent | 686913aa9f5179647818813fd2bc8342cf7119c4 (diff) | |
| download | lwn-8b076738593244000c003111e67dba49bbbafab0.tar.gz lwn-8b076738593244000c003111e67dba49bbbafab0.zip | |
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
Diffstat (limited to 'arch/avr32')
| -rw-r--r-- | arch/avr32/boards/hammerhead/flash.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/arch/avr32/boards/hammerhead/flash.c b/arch/avr32/boards/hammerhead/flash.c index 776c3cb9b6e4..e86280ccd8fa 100644 --- a/arch/avr32/boards/hammerhead/flash.c +++ b/arch/avr32/boards/hammerhead/flash.c @@ -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; } |