X-Git-Url: https://git.decadent.org.uk/gitweb/?p=exar-uart-driver.git;a=blobdiff_plain;f=vizzini.c;h=56df5863666b5debe74c5bc1221fb594e4489899;hp=9e085c003b0c426fda9154dbdeb6a9ba0c0c7dee;hb=fb29dc475af792f20d6549deb8f52201169d7792;hpb=3bda297edb97d28ae6ff0d19298c4e89c36c7b6e

diff --git a/vizzini.c b/vizzini.c
index 9e085c0..56df586 100644
--- a/vizzini.c
+++ b/vizzini.c
@@ -1591,7 +1591,7 @@ skip_countries:
 	xr21v141x->ctrlurb->transfer_flags |= URB_NO_TRANSFER_DMA_MAP;
 	xr21v141x->ctrlurb->transfer_dma = xr21v141x->ctrl_dma;
 
-	dev_info(&intf->dev, "ttyUSB%d: XR21v14x usb uart device\n", minor);
+	dev_info(&intf->dev, "ttyVIZ%d: XR21v14x usb uart device\n", minor);
 
 	xr21v141x_set_control(xr21v141x, xr21v141x->ctrlout);
 
@@ -1853,11 +1853,13 @@ static int __init xr21v141x_init(void)
 {
 	int retval;
 	xr21v141x_tty_driver = alloc_tty_driver(XR21V141X_TTY_MINORS);
-	if (!xr21v141x_tty_driver)
+	if (!xr21v141x_tty_driver) {
+		printk(KERN_INFO KBUILD_MODNAME ": alloc_tty_driver(%d) failed\n", XR21V141X_TTY_MINORS);
 		return -ENOMEM;
+        }
 	xr21v141x_tty_driver->driver_name = "vizzini",
-	xr21v141x_tty_driver->name = "ttyUSB",
-	xr21v141x_tty_driver->major = XR21V141X_TTY_MAJOR,
+	xr21v141x_tty_driver->name = "ttyVIZ",
+	xr21v141x_tty_driver->major = 0, // Dynamically allocate the major number
 	xr21v141x_tty_driver->minor_start = 0,
 	xr21v141x_tty_driver->type = TTY_DRIVER_TYPE_SERIAL,
 	xr21v141x_tty_driver->subtype = SERIAL_TYPE_NORMAL,
@@ -1869,12 +1871,14 @@ static int __init xr21v141x_init(void)
 
 	retval = tty_register_driver(xr21v141x_tty_driver);
 	if (retval) {
+		printk(KERN_INFO KBUILD_MODNAME ": tty_register_driver failed\n");
 		put_tty_driver(xr21v141x_tty_driver);
 		return retval;
 	}
 
 	retval = usb_register(&xr21v141x_driver);
 	if (retval) {
+		printk(KERN_INFO KBUILD_MODNAME ": usb_register failed\n");
 		tty_unregister_driver(xr21v141x_tty_driver);
 		put_tty_driver(xr21v141x_tty_driver);
 		return retval;
@@ -1898,4 +1902,3 @@ module_exit(xr21v141x_exit);
 MODULE_AUTHOR(DRIVER_AUTHOR);
 MODULE_DESCRIPTION(DRIVER_DESC);
 MODULE_LICENSE("GPL");
-MODULE_ALIAS_CHARDEV_MAJOR(ACM_TTY_MAJOR);