aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-04-20 19:53:59 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-04-20 19:53:59 -0400
commit461863df3c8d4402495684eff9c11cc7e3f8aaea (patch)
tree3fd805b102be63295af405c0761c11acdd833aa7 /drivers
parent085fb962623b7278fd2f33a8604c37dd22d06b70 (diff)
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>
Diffstat (limited to 'drivers')
-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 836cfa9a515..9b3c4a48ef6 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)
1412 req_pkt->bRequestType, req_pkt->bRequest); 1412 req_pkt->bRequestType, req_pkt->bRequest);
1413 } 1413 }
1414 } else 1414 } else
1415 err("%s: error %d", __func__, status); 1415 dev_err(&port->dev, "%s: error %d\n", __func__, status);
1416 1416
1417 /* Resubmit urb so we continue receiving IRQ data */ 1417 /* Resubmit urb so we continue receiving IRQ data */
1418 if (status != -ESHUTDOWN && status != -ENOENT) { 1418 if (status != -ESHUTDOWN && status != -ENOENT) {