From 2832aed1f0cb0995be676ab5269147eb940a8e39 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 24 Apr 2012 09:04:42 -0700 Subject: [PATCH] --- yaml --- r: 303595 b: refs/heads/master c: 92206f47d969724023694b264196847d4c84487f h: refs/heads/master i: 303593: c80350b6a837db80128abec52a812f07f9e46aa3 303591: 780a3849b46d53a82df55b03d356a238fd488366 v: v3 --- [refs] | 2 +- trunk/drivers/staging/quatech_usb2/quatech_usb2.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 4a9964eceb26..8600f66d29ca 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b883052e0176d8c0c3b9375d19749c3897ad1bc2 +refs/heads/master: 92206f47d969724023694b264196847d4c84487f diff --git a/trunk/drivers/staging/quatech_usb2/quatech_usb2.c b/trunk/drivers/staging/quatech_usb2/quatech_usb2.c index bb977e00cc86..679b249b11cb 100644 --- a/trunk/drivers/staging/quatech_usb2/quatech_usb2.c +++ b/trunk/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; } }