aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/serial/mos7840.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/usb/serial/mos7840.c')
-rw-r--r--drivers/usb/serial/mos7840.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/usb/serial/mos7840.c b/drivers/usb/serial/mos7840.c
index f981b08ff32f..0a818b238508 100644
--- a/drivers/usb/serial/mos7840.c
+++ b/drivers/usb/serial/mos7840.c
@@ -1057,7 +1057,7 @@ static int mos7840_open(struct tty_struct *tty, struct usb_serial_port *port)
1057 * structures were not set up at that time.) */ 1057 * structures were not set up at that time.) */
1058 1058
1059 dev_dbg(&port->dev, "port number is %d\n", port->port_number); 1059 dev_dbg(&port->dev, "port number is %d\n", port->port_number);
1060 dev_dbg(&port->dev, "minor number is %d\n", port->serial->minor); 1060 dev_dbg(&port->dev, "minor number is %d\n", port->minor);
1061 dev_dbg(&port->dev, "Bulkin endpoint is %d\n", port->bulk_in_endpointAddress); 1061 dev_dbg(&port->dev, "Bulkin endpoint is %d\n", port->bulk_in_endpointAddress);
1062 dev_dbg(&port->dev, "BulkOut endpoint is %d\n", port->bulk_out_endpointAddress); 1062 dev_dbg(&port->dev, "BulkOut endpoint is %d\n", port->bulk_out_endpointAddress);
1063 dev_dbg(&port->dev, "Interrupt endpoint is %d\n", port->interrupt_in_endpointAddress); 1063 dev_dbg(&port->dev, "Interrupt endpoint is %d\n", port->interrupt_in_endpointAddress);
@@ -2068,7 +2068,7 @@ static int mos7840_get_serial_info(struct moschip_port *mos7840_port,
2068 memset(&tmp, 0, sizeof(tmp)); 2068 memset(&tmp, 0, sizeof(tmp));
2069 2069
2070 tmp.type = PORT_16550A; 2070 tmp.type = PORT_16550A;
2071 tmp.line = mos7840_port->port->serial->minor; 2071 tmp.line = mos7840_port->port->minor;
2072 tmp.port = mos7840_port->port->port_number; 2072 tmp.port = mos7840_port->port->port_number;
2073 tmp.irq = 0; 2073 tmp.irq = 0;
2074 tmp.flags = ASYNC_SKIP_TEST | ASYNC_AUTO_IRQ; 2074 tmp.flags = ASYNC_SKIP_TEST | ASYNC_AUTO_IRQ;
@@ -2246,9 +2246,8 @@ static int mos7840_port_probe(struct usb_serial_port *port)
2246 * usb-serial.c:get_free_serial() and cannot therefore be used 2246 * usb-serial.c:get_free_serial() and cannot therefore be used
2247 * to index device instances */ 2247 * to index device instances */
2248 mos7840_port->port_num = pnum + 1; 2248 mos7840_port->port_num = pnum + 1;
2249 dev_dbg(&port->dev, "port->serial->minor = %d\n", port->serial->minor); 2249 dev_dbg(&port->dev, "port->minor = %d\n", port->minor);
2250 dev_dbg(&port->dev, "mos7840_port->port_num = %d\n", mos7840_port->port_num); 2250 dev_dbg(&port->dev, "mos7840_port->port_num = %d\n", mos7840_port->port_num);
2251 dev_dbg(&port->dev, "serial->minor = %d\n", serial->minor);
2252 2251
2253 if (mos7840_port->port_num == 1) { 2252 if (mos7840_port->port_num == 1) {
2254 mos7840_port->SpRegOffset = 0x0; 2253 mos7840_port->SpRegOffset = 0x0;