diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2016-08-03 21:16:10 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2016-08-03 21:16:10 -0400 |
| commit | 326a50f5734c228873eb33c6db6c5240c44f2ecc (patch) | |
| tree | f954bb63fc74d44e327c578f3114d62ff9d04b86 /drivers/input/rmi4 | |
| parent | 0808882863774ab69066d83f49f511606be024e0 (diff) | |
| parent | a485cb037fe64367ec14813f018edb87799c5eb1 (diff) | |
Merge branch 'next' into for-linus
Prepare second round of input updates for 4.8 merge window.
Diffstat (limited to 'drivers/input/rmi4')
| -rw-r--r-- | drivers/input/rmi4/rmi_bus.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/input/rmi4/rmi_bus.c b/drivers/input/rmi4/rmi_bus.c index 253df96be427..a73580654c6b 100644 --- a/drivers/input/rmi4/rmi_bus.c +++ b/drivers/input/rmi4/rmi_bus.c | |||
| @@ -232,10 +232,7 @@ err_put_device: | |||
| 232 | void rmi_unregister_function(struct rmi_function *fn) | 232 | void rmi_unregister_function(struct rmi_function *fn) |
| 233 | { | 233 | { |
| 234 | device_del(&fn->dev); | 234 | device_del(&fn->dev); |
| 235 | 235 | of_node_put(fn->dev.of_node); | |
| 236 | if (fn->dev.of_node) | ||
| 237 | of_node_put(fn->dev.of_node); | ||
| 238 | |||
| 239 | put_device(&fn->dev); | 236 | put_device(&fn->dev); |
| 240 | } | 237 | } |
| 241 | 238 | ||