diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-09-13 12:45:50 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-09-13 12:45:50 -0700 |
commit | 6142811a3395188bac6fa4f5c4223471b1ac98a8 (patch) | |
tree | 76fa1cfd80eddfc7e529683685baebfd54f4096b /drivers/serial | |
parent | 49553c2ef88749dd502687f4eb9c258bb10a4f44 (diff) | |
parent | 25c8e03bdb769dfe2381f8b7942f05b0eb4bdf31 (diff) | |
download | kernel_samsung_tuna-6142811a3395188bac6fa4f5c4223471b1ac98a8.zip kernel_samsung_tuna-6142811a3395188bac6fa4f5c4223471b1ac98a8.tar.gz kernel_samsung_tuna-6142811a3395188bac6fa4f5c4223471b1ac98a8.tar.bz2 |
Merge branch 'next-spi' of git://git.secretlab.ca/git/linux-2.6
* 'next-spi' of git://git.secretlab.ca/git/linux-2.6:
spi/pl022: move probe call to subsys_initcall()
powerpc/5200: mpc52xx_uart.c: Add of_node_put to avoid memory leak
spi/pl022: fix APB pclk power regression on U300
spi/spi_s3c64xx: Warn if PIO transfers time out
spi/s3c64xx: Fix incorrect reuse of 'val' local variable.
spi/s3c64xx: Fix compilation warning
spi/dw_spi: clean the cs_control code
spi/dw_spi: Allow interrupt sharing
spi/spi_s3c64xx: Increase dead reckoning time in wait_for_xfer()
spi/spi_s3c64xx: Move to subsys_initcall()
spi: free children in spi_unregister_master, not siblings
gpiolib: Add 'struct gpio_chip' forward declaration for !GPIOLIB case
of: Fix missing includes - ll_temac
spi/spi_s3c64xx: Staticise non-exported functions
spi/spi_s3c64xx: Make probe more robust against missing board config
Diffstat (limited to 'drivers/serial')
-rw-r--r-- | drivers/serial/mpc52xx_uart.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/serial/mpc52xx_uart.c b/drivers/serial/mpc52xx_uart.c index 8dedb26..c4399e2 100644 --- a/drivers/serial/mpc52xx_uart.c +++ b/drivers/serial/mpc52xx_uart.c @@ -500,6 +500,7 @@ static int __init mpc512x_psc_fifoc_init(void) psc_fifoc = of_iomap(np, 0); if (!psc_fifoc) { pr_err("%s: Can't map FIFOC\n", __func__); + of_node_put(np); return -ENODEV; } |