summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Kroah-Hartman2012-04-21 01:53:59 +0200
committerGreg Kroah-Hartman2012-04-21 01:53:59 +0200
commit461863df3c8d4402495684eff9c11cc7e3f8aaea (patch)
tree3fd805b102be63295af405c0761c11acdd833aa7
parentUSB: console.c: remove err() usage (diff)
downloadkernel-qcow2-linux-461863df3c8d4402495684eff9c11cc7e3f8aaea.tar.gz
kernel-qcow2-linux-461863df3c8d4402495684eff9c11cc7e3f8aaea.tar.xz
kernel-qcow2-linux-461863df3c8d4402495684eff9c11cc7e3f8aaea.zip
USB: option.c: 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: Matthias Urlichs <smurf@smurf.noris.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/usb/serial/option.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
index 836cfa9a515f..9b3c4a48ef6d 100644
--- a/drivers/usb/serial/option.c
+++ b/drivers/usb/serial/option.c
@@ -1412,7 +1412,7 @@ static void option_instat_callback(struct urb *urb)
req_pkt->bRequestType, req_pkt->bRequest);
}
} else
- err("%s: error %d", __func__, status);
+ dev_err(&port->dev, "%s: error %d\n", __func__, status);
/* Resubmit urb so we continue receiving IRQ data */
if (status != -ESHUTDOWN && status != -ENOENT) {