Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 133549
b: refs/heads/master
c: 9732495
h: refs/heads/master
i:
  133547: 78738c2
v: v3
  • Loading branch information
Craig Shelley authored and Greg Kroah-Hartman committed Mar 24, 2009
1 parent ed558c6 commit 22d66c9
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 13 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: ef8b6bcb39559d956f897acf7ebe600d5105d479
refs/heads/master: 97324955c62aaa104edea2ef4370dc8882a5ab82
19 changes: 7 additions & 12 deletions trunk/drivers/usb/serial/cp2101.c
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,6 @@
* thanks to Karl Hiramoto karl@hiramoto.org. RTSCTS hardware flow
* control thanks to Munir Nassar nassarmu@real-time.com
*
* Outstanding Issues:
* Buffers are not flushed when the port is opened.
* Multiple calls to write() may fail with "Resource temporarily unavailable"
*
*/

#include <linux/kernel.h>
Expand Down Expand Up @@ -225,7 +221,7 @@ static int cp2101_get_config(struct usb_serial_port *port, u8 request,
kfree(buf);

if (result != size) {
dev_err(&port->dev, "%s - Unable to send config request, "
dbg("%s - Unable to send config request, "
"request=0x%x size=%d result=%d\n",
__func__, request, size, result);
return -EPROTO;
Expand Down Expand Up @@ -276,7 +272,7 @@ static int cp2101_set_config(struct usb_serial_port *port, u8 request,
kfree(buf);

if ((size > 2 && result != size) || result < 0) {
dev_err(&port->dev, "%s - Unable to send request, "
dbg("%s - Unable to send request, "
"request=0x%x size=%d result=%d\n",
__func__, request, size, result);
return -EPROTO;
Expand Down Expand Up @@ -566,8 +562,7 @@ static void cp2101_set_termios(struct tty_struct *tty,
baud);
if (cp2101_set_config_single(port, CP2101_BAUDRATE,
((BAUD_RATE_GEN_FREQ + baud/2) / baud))) {
dev_err(&port->dev, "Baud rate requested not "
"supported by device\n");
dbg("Baud rate requested not supported by device\n");
baud = tty_termios_baud_rate(old_termios);
}
}
Expand Down Expand Up @@ -600,14 +595,14 @@ static void cp2101_set_termios(struct tty_struct *tty,
dbg("%s - data bits = 9", __func__);
break;*/
default:
dev_err(&port->dev, "cp2101 driver does not "
dbg("cp2101 driver does not "
"support the number of bits requested,"
" using 8 bit mode\n");
bits |= BITS_DATA_8;
break;
}
if (cp2101_set_config(port, CP2101_BITS, &bits, 2))
dev_err(&port->dev, "Number of data bits requested "
dbg("Number of data bits requested "
"not supported by device\n");
}

Expand All @@ -624,7 +619,7 @@ static void cp2101_set_termios(struct tty_struct *tty,
}
}
if (cp2101_set_config(port, CP2101_BITS, &bits, 2))
dev_err(&port->dev, "Parity mode not supported "
dbg("Parity mode not supported "
"by device\n");
}

Expand All @@ -639,7 +634,7 @@ static void cp2101_set_termios(struct tty_struct *tty,
dbg("%s - stop bits = 1", __func__);
}
if (cp2101_set_config(port, CP2101_BITS, &bits, 2))
dev_err(&port->dev, "Number of stop bits requested "
dbg("Number of stop bits requested "
"not supported by device\n");
}

Expand Down

0 comments on commit 22d66c9

Please sign in to comment.