diff options
| author | Colin Cross <ccross@android.com> | 2010-10-21 14:48:14 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2010-10-21 14:48:14 -0700 |
| commit | 766197150ffa2e0fc34e852203372f0903ddd9ed (patch) | |
| tree | 837dad8eddfec6f15e725c5d497dae25dd450593 /drivers/serial | |
| parent | 61804f1c4993adc1df1f2ebd4425b1249b7e531a (diff) | |
| parent | f6f94e2ab1b33f0082ac22d71f66385a60d8157f (diff) | |
Merge commit 'v2.6.36' into linux-tegra-2.6.36
Diffstat (limited to 'drivers/serial')
| -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); |