summaryrefslogtreecommitdiff
path: root/drivers/staging
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-04-24 16:04:42 (GMT)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-04-24 16:04:42 (GMT)
commitc471bf65f78fc6841a2c59b1e9377b6b8d40965f (patch)
treedc6cff5e411d5f6577e71e3655c578e8234da657 /drivers/staging
parent9b33da165ba857cdfd004df56f58d5ca612d78d9 (diff)
downloadlinux-c471bf65f78fc6841a2c59b1e9377b6b8d40965f.tar.xz
Staging: quatech_usb3: remove err() usage
err() was a very old USB-specific macro that I thought had gone away. This patch removes it from being used in the driver and uses dev_err() instead Cc: Rusty Russell <rusty@rustcorp.com.au> Cc: Alan Stern <stern@rowland.harvard.edu> Cc: Mauro Carvalho Chehab <mchehab@redhat.com> Cc: Kautuk Consul <consul.kautuk@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging')
-rw-r--r--drivers/staging/quatech_usb2/quatech_usb2.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/quatech_usb2/quatech_usb2.c b/drivers/staging/quatech_usb2/quatech_usb2.c
index cb7d906..801b50d 100644
--- a/drivers/staging/quatech_usb2/quatech_usb2.c
+++ b/drivers/staging/quatech_usb2/quatech_usb2.c
@@ -541,7 +541,7 @@ int qt2_open(struct tty_struct *tty, struct usb_serial_port *port)
dbg("port->write_urb == NULL, allocating one");
port->write_urb = usb_alloc_urb(0, GFP_KERNEL);
if (!port->write_urb) {
- err("Allocating write URB failed");
+ dev_err(&port->dev, "Allocating write URB failed\n");
return -ENOMEM;
}
/* buffer same size as port0 */
@@ -549,7 +549,7 @@ int qt2_open(struct tty_struct *tty, struct usb_serial_port *port)
port->bulk_out_buffer = kmalloc(port->bulk_out_size,
GFP_KERNEL);
if (!port->bulk_out_buffer) {
- err("Couldn't allocate bulk_out_buffer");
+ dev_err(&port->dev, "Couldn't allocate bulk_out_buffer\n");
return -ENOMEM;
}
}