diff options
| author | Olof Johansson <olof@lixom.net> | 2016-02-01 21:27:18 +0100 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2016-02-01 21:27:18 +0100 |
| commit | aa5306a370a9384788d923e4eae15649f1f82671 (patch) | |
| tree | 321c2a1fb7e95e867e6b9dcf47a945786c4b2f79 /drivers/bus | |
| parent | Merge tag 'mvebu-fixes-4.5-1' of git://git.infradead.org/linux-mvebu into fixes (diff) | |
| parent | arm64: dts: Add missing DMA Abort interrupt to Juno (diff) | |
| download | linux-aa5306a370a9384788d923e4eae15649f1f82671.tar.xz linux-aa5306a370a9384788d923e4eae15649f1f82671.zip | |
Merge tag 'vexpress-for-v4.5/fixes-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into fixes
vexpress fixes for v4.5
Couple of minor fixes for vexpress platforms:
1. Add missing of_node_put in vexpress config bus
2. Add missing DMA-330 abort interrupt on Juno platforms
* tag 'vexpress-for-v4.5/fixes-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux:
arm64: dts: Add missing DMA Abort interrupt to Juno
bus: vexpress-config: Add missing of_node_put
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'drivers/bus')
| -rw-r--r-- | drivers/bus/vexpress-config.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/bus/vexpress-config.c b/drivers/bus/vexpress-config.c index 6575c0fe6a4e..c3cb76b363c6 100644 --- a/drivers/bus/vexpress-config.c +++ b/drivers/bus/vexpress-config.c @@ -192,8 +192,10 @@ static int __init vexpress_config_init(void) /* Need the config devices early, before the "normal" devices... */ for_each_compatible_node(node, NULL, "arm,vexpress,config-bus") { err = vexpress_config_populate(node); - if (err) + if (err) { + of_node_put(node); break; + } } return err; |