Skip to contentSkip to conversation

IOC3/IOC4: Fix error path on driver registration

PATCH In review Jean Delvare 2 participants 2 messages Dec 3, 2009

lore
Share & tools
lore
#0 lore raw

PATCH 2/2 IOC3/IOC4: Fix error path on driver registration

Two IOC3 and IOC4 drivers have broken error paths on registration. Fix them.

---
Note: I was not able to build-test these patches, please do.

 drivers/serial/ioc4_serial.c |   16 +++++++++++++---
 drivers/sn/ioc3.c            |    2 +-
 2 files changed, 14 insertions(+), 4 deletions(-)
drivers/serial/ioc4_serial.c +13 -3
@@ -2913,17 +2913,27 @@ static int __init ioc4_serial_init(void)
 		printk(KERN_WARNING
 			"%s: Couldn't register rs232 IOC4 serial driver\n",
 			__func__);
-		return ret;
+		goto out;
 	}
 	if ((ret = uart_register_driver(&ioc4_uart_rs422)) < 0) {
 		printk(KERN_WARNING
 			"%s: Couldn't register rs422 IOC4 serial driver\n",
 			__func__);
-		return ret;
+		goto out_uart_rs232;
 	}
 
 	/* register with IOC4 main module */
-	return ioc4_register_submodule(&ioc4_serial_submodule);
+	ret = ioc4_register_submodule(&ioc4_serial_submodule);
+	if (ret)
+		goto out_uart_rs422;
+	return 0;
+
+out_uart_rs422:
+	uart_unregister_driver(&ioc4_uart_rs422);
+out_uart_rs232:
+	uart_unregister_driver(&ioc4_uart_rs232);
+out:
+	return ret;
 }
 
 static void __exit ioc4_serial_exit(void)
drivers/sn/ioc3.c +1 -1
@@ -820,7 +820,7 @@ static int __init ioc3_init(void)
 {
 	if (ia64_platform_is("sn2"))
 		return pci_register_driver(&ioc3_driver);
-	return 0;
+	return -ENODEV;
 }
 
 /* Module unload */
Signature · 1 line
Jean Delvare
#1 lore raw
Quoted 1 line · On Thu, 3 Dec 2009 14:39:39 +0100 Jean Delvare <[email protected]> wrote:

Note: I was not able to build-test these patches, please do.

I tried, but it seems that they're finally managed to kill my ia64 toolchain:

/usr/src/25/arch/ia64/include/asm/paravirt_privop.h:409: error: impossible constraint in `asm'

oh well. If it doesn't compile I'm sure that someone will let us know.