aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorJohan Hovold <jhovold@gmail.com>2009-12-28 17:01:45 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2010-03-02 17:53:49 -0500
commit6a9b15fed4dca1f90e41ae0cfe35aaa39a20f495 (patch)
tree2d8265d87be011bdf2a9b119cb13525946d32eb0 /drivers
parent881142660697bba0f3ef44f070d80632082c978f (diff)
USB: ch341: replace printk warnings with dev_err
Signed-off-by: Johan Hovold <jhovold@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/usb/serial/ch341.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/usb/serial/ch341.c b/drivers/usb/serial/ch341.c
index 59eff721fcc5..5e455f4a792e 100644
--- a/drivers/usb/serial/ch341.c
+++ b/drivers/usb/serial/ch341.c
@@ -399,8 +399,8 @@ static void ch341_break_ctl(struct tty_struct *tty, int break_state)
399 r = ch341_control_in(port->serial->dev, CH341_REQ_READ_REG, 399 r = ch341_control_in(port->serial->dev, CH341_REQ_READ_REG,
400 ch341_break_reg, 0, break_reg, sizeof(break_reg)); 400 ch341_break_reg, 0, break_reg, sizeof(break_reg));
401 if (r < 0) { 401 if (r < 0) {
402 printk(KERN_WARNING "%s: USB control read error whilst getting" 402 dev_err(&port->dev, "%s - USB control read error (%d)\n",
403 " break register contents.\n", __FILE__); 403 __func__, r);
404 return; 404 return;
405 } 405 }
406 dbg("%s - initial ch341 break register contents - reg1: %x, reg2: %x", 406 dbg("%s - initial ch341 break register contents - reg1: %x, reg2: %x",
@@ -420,8 +420,8 @@ static void ch341_break_ctl(struct tty_struct *tty, int break_state)
420 r = ch341_control_out(port->serial->dev, CH341_REQ_WRITE_REG, 420 r = ch341_control_out(port->serial->dev, CH341_REQ_WRITE_REG,
421 ch341_break_reg, reg_contents); 421 ch341_break_reg, reg_contents);
422 if (r < 0) 422 if (r < 0)
423 printk(KERN_WARNING "%s: USB control write error whilst setting" 423 dev_err(&port->dev, "%s - USB control write error (%d)\n",
424 " break register contents.\n", __FILE__); 424 __func__, r);
425} 425}
426 426
427static int ch341_tiocmset(struct tty_struct *tty, struct file *file, 427static int ch341_tiocmset(struct tty_struct *tty, struct file *file,