diff options
| author | Michael Ellerman <mpe@ellerman.id.au> | 2015-02-04 12:03:21 +1100 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2015-02-04 12:03:21 +1100 |
| commit | a604c96eb07b2b65734a8aa0e9e8c1bfc435ee4f (patch) | |
| tree | b1fad9ec35f0282acddbf71f3885a0b6a85f399b /arch/powerpc/platforms/83xx/usb.c | |
| parent | 5c65670c9bfa3be1234d29f36b742897c0360ef3 (diff) | |
| parent | 0dc294f717d41bfbafc746a7a96a7bc0f114c20c (diff) | |
| download | linux-a604c96eb07b2b65734a8aa0e9e8c1bfc435ee4f.tar.gz linux-a604c96eb07b2b65734a8aa0e9e8c1bfc435ee4f.tar.bz2 linux-a604c96eb07b2b65734a8aa0e9e8c1bfc435ee4f.zip | |
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/scottwood/linux into next
Freescale updates from Scott:
"Highlights include 8xx optimizations, some more work on datapath device
tree content, e300 machine check support, t1040 corenet error reporting,
and various cleanups and fixes."
Diffstat (limited to 'arch/powerpc/platforms/83xx/usb.c')
| -rw-r--r-- | arch/powerpc/platforms/83xx/usb.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/powerpc/platforms/83xx/usb.c b/arch/powerpc/platforms/83xx/usb.c index 1ad748bb39b4..5c31d8292d3b 100644 --- a/arch/powerpc/platforms/83xx/usb.c +++ b/arch/powerpc/platforms/83xx/usb.c @@ -162,8 +162,7 @@ int mpc831x_usb_cfg(void) iounmap(immap); - if (immr_node) - of_node_put(immr_node); + of_node_put(immr_node); /* Map USB SOC space */ ret = of_address_to_resource(np, 0, &res); |