summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-04-25 23:48:49 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-04-25 23:48:49 +0200
commit3d55ea3e2233c994649d9e5dc9eff58f915cd81d (patch)
tree44d704e928bf93429810d54da4b48c5183df21d8
parentUSB: hdpvr-core.c: remove err() usage (diff)
downloadlinux-3d55ea3e2233c994649d9e5dc9eff58f915cd81d.tar.xz
linux-3d55ea3e2233c994649d9e5dc9eff58f915cd81d.zip
USB: irda-usb.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: Samuel Ortiz <samuel@sortiz.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/net/irda/irda-usb.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/irda/irda-usb.c b/drivers/net/irda/irda-usb.c
index 72f687b40d66..f9a86bdb12fa 100644
--- a/drivers/net/irda/irda-usb.c
+++ b/drivers/net/irda/irda-usb.c
@@ -1671,7 +1671,7 @@ static int irda_usb_probe(struct usb_interface *intf,
/* Is this really necessary? (no, except maybe for broken devices) */
if (usb_reset_configuration (dev) < 0) {
- err("reset_configuration failed");
+ dev_err(&intf->dev, "reset_configuration failed\n");
ret = -EIO;
goto err_out_3;
}