Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6

[mv-sheeva.git] / drivers / serial / ioc3_serial.c

diff --git a/drivers/serial/ioc3_serial.c b/drivers/serial/ioc3_serial.c
index 08d77b041bd8599923ef3240f6221d0551dc5179..ee43efc7bdcc5b1dcc406f69845f7bbcca0582e5 100644 (file)
--- a/drivers/serial/ioc3_serial.c
+++ b/drivers/serial/ioc3_serial.c
@@ -2045,6 +2045,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);