diff options
| author |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-10-30 06:38:44 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-10-30 06:38:44 -0400 |
| commit | bdc065666a591fddc4e55cbdcd6c7b02f289b5ff (patch) | |
| tree | acb92182d7c28a8d5176feb99fd7fb110a693ab7 /drivers/staging/greybus/arche-platform.c | |
| parent | staging: vc04_services: use bcm2835 consequently (diff) | |
| parent | Linux 4.9-rc3 (diff) | |
| download | linux-dev-bdc065666a591fddc4e55cbdcd6c7b02f289b5ff.tar.xz linux-dev-bdc065666a591fddc4e55cbdcd6c7b02f289b5ff.zip | |
Merge 4.9-rc3 into staging-next
This resolves a merge issue with
drivers/staging/iio/accel/sca3000_core.c and we want the fixes all in
here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/greybus/arche-platform.c')
| -rw-r--r-- | drivers/staging/greybus/arche-platform.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/staging/greybus/arche-platform.c b/drivers/staging/greybus/arche-platform.c index a850f6bd84c1..389ed3621c32 100644 --- a/drivers/staging/greybus/arche-platform.c +++ b/drivers/staging/greybus/arche-platform.c @@ -128,6 +128,7 @@ int arche_platform_change_state(enum arche_platform_state state, pdev = of_find_device_by_node(np); if (!pdev) { pr_err("arche-platform device not found\n"); + of_node_put(np); return -ENODEV; } |