diff options
| author | Colin Cross <ccross@android.com> | 2010-10-21 14:52:03 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2010-10-21 14:52:03 -0700 |
| commit | 677151f967dc7ced6840d420f69e15ed6ed3e553 (patch) | |
| tree | a3b8e227e83909e5105920aade6adc79fdc63680 /drivers/serial | |
| parent | ea63bded335543aa6855a9f2d2da836c4853a569 (diff) | |
| parent | 766197150ffa2e0fc34e852203372f0903ddd9ed (diff) | |
Merge branch 'linux-tegra-2.6.36' into android-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); |