diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-12-03 09:35:27 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-12-03 09:35:27 -0800 |
| commit | 9099ff769faf879b5cb6e24e04c7904a8352aef0 (patch) | |
| tree | bbda760074f0a5906f86a3e5c2486c6fee401179 /drivers/sbus/char/envctrl.c | |
| parent | 2595646791c319cadfdbf271563aac97d0843dc7 (diff) | |
| parent | dac097c4546e4c5b16dd303a1e97c1d319c8ab3e (diff) | |
| download | linux-9099ff769faf879b5cb6e24e04c7904a8352aef0.tar.bz2 | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
Pull sparc fixes from David Miller:
1) Some implicit switch fallthrough fixes from Stephen Rothwell.
2) Missing of_node_put() in various sparc drivers from Yangtao Li.
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
drivers/tty: add missing of_node_put()
drivers/sbus/char: add of_node_put()
sbus: char: add of_node_put()
sparc32: supress another implicit-fallthrough warning
sparc32: suppress an implicit-fallthrough warning
sparc: suppress the implicit-fallthrough warning
arch/sparc: Use kzalloc_node
Diffstat (limited to 'drivers/sbus/char/envctrl.c')
| -rw-r--r-- | drivers/sbus/char/envctrl.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/sbus/char/envctrl.c b/drivers/sbus/char/envctrl.c index 56e962a01493..b8481927bfe4 100644 --- a/drivers/sbus/char/envctrl.c +++ b/drivers/sbus/char/envctrl.c @@ -910,8 +910,10 @@ static void envctrl_init_i2c_child(struct device_node *dp, for (len = 0; len < PCF8584_MAX_CHANNELS; ++len) { pchild->mon_type[len] = ENVCTRL_NOMON; } + of_node_put(root_node); return; } + of_node_put(root_node); } /* Get the monitor channels. */ |