aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/usb/serial/cp2101.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/drivers/usb/serial/cp2101.c b/drivers/usb/serial/cp2101.c
index f5b57b196c5a..2bc5576c443a 100644
--- a/drivers/usb/serial/cp2101.c
+++ b/drivers/usb/serial/cp2101.c
@@ -365,8 +365,8 @@ static void cp2101_close (struct usb_serial_port *port, struct file * filp)
365static void cp2101_get_termios (struct usb_serial_port *port) 365static void cp2101_get_termios (struct usb_serial_port *port)
366{ 366{
367 unsigned int cflag, modem_ctl[4]; 367 unsigned int cflag, modem_ctl[4];
368 int baud; 368 unsigned int baud;
369 int bits; 369 unsigned int bits;
370 370
371 dbg("%s - port %d", __func__, port->number); 371 dbg("%s - port %d", __func__, port->number);
372 372
@@ -498,7 +498,7 @@ static void cp2101_set_termios (struct usb_serial_port *port,
498 struct ktermios *old_termios) 498 struct ktermios *old_termios)
499{ 499{
500 unsigned int cflag, old_cflag; 500 unsigned int cflag, old_cflag;
501 int baud=0, bits; 501 unsigned int baud = 0, bits;
502 unsigned int modem_ctl[4]; 502 unsigned int modem_ctl[4];
503 503
504 dbg("%s - port %d", __func__, port->number); 504 dbg("%s - port %d", __func__, port->number);
@@ -654,7 +654,7 @@ static void cp2101_set_termios (struct usb_serial_port *port,
654static int cp2101_tiocmset (struct usb_serial_port *port, struct file *file, 654static int cp2101_tiocmset (struct usb_serial_port *port, struct file *file,
655 unsigned int set, unsigned int clear) 655 unsigned int set, unsigned int clear)
656{ 656{
657 int control = 0; 657 unsigned int control = 0;
658 658
659 dbg("%s - port %d", __func__, port->number); 659 dbg("%s - port %d", __func__, port->number);
660 660
@@ -683,7 +683,8 @@ static int cp2101_tiocmset (struct usb_serial_port *port, struct file *file,
683 683
684static int cp2101_tiocmget (struct usb_serial_port *port, struct file *file) 684static int cp2101_tiocmget (struct usb_serial_port *port, struct file *file)
685{ 685{
686 int control, result; 686 unsigned int control;
687 int result;
687 688
688 dbg("%s - port %d", __func__, port->number); 689 dbg("%s - port %d", __func__, port->number);
689 690
@@ -703,7 +704,7 @@ static int cp2101_tiocmget (struct usb_serial_port *port, struct file *file)
703 704
704static void cp2101_break_ctl (struct usb_serial_port *port, int break_state) 705static void cp2101_break_ctl (struct usb_serial_port *port, int break_state)
705{ 706{
706 int state; 707 unsigned int state;
707 708
708 dbg("%s - port %d", __func__, port->number); 709 dbg("%s - port %d", __func__, port->number);
709 if (break_state == 0) 710 if (break_state == 0)