diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-20 22:18:21 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-20 22:18:21 +0200 |
| commit | 7d7c4d06be246b249f0f7e0b7df2f73d09cc6376 (patch) | |
| tree | 7c7d3314b7bea5fe932eb76d80d9a102ffcda204 /drivers | |
| parent | virtio: console: Don't block entire guest if host doesn't read data (diff) | |
| parent | MIPS: O32 compat/N32: Fix to use compat syscall wrappers for AIO syscalls. (diff) | |
| download | linux-7d7c4d06be246b249f0f7e0b7df2f73d09cc6376.tar.xz linux-7d7c4d06be246b249f0f7e0b7df2f73d09cc6376.zip | |
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus:
MIPS: O32 compat/N32: Fix to use compat syscall wrappers for AIO syscalls.
MAINTAINERS: Change list for ioc_serial to linux-serial.
SERIAL: ioc3_serial: Return -ENOMEM on memory allocation failure
MIPS: jz4740: Fix Kbuild Platform file.
MIPS: Repair Kbuild make clean breakage.
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/serial/ioc3_serial.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/serial/ioc3_serial.c b/drivers/serial/ioc3_serial.c index 93de907b1208..800c54602339 100644 --- a/drivers/serial/ioc3_serial.c +++ b/drivers/serial/ioc3_serial.c @@ -2044,6 +2044,7 @@ ioc3uart_probe(struct ioc3_submodule *is, struct ioc3_driver_data *idd) if (!port) { printk(KERN_WARNING "IOC3 serial memory not available for port\n"); + ret = -ENOMEM; goto out4; } spin_lock_init(&port->ip_lock); |