From af2484349d6a4aae68bb03625d9e767b4b7556bc Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 25 Apr 2012 14:48:49 -0700 Subject: [PATCH] --- yaml --- r: 303627 b: refs/heads/master c: 3d55ea3e2233c994649d9e5dc9eff58f915cd81d h: refs/heads/master i: 303625: 1e85a02f7a57910ced1fdd58aebe0b6723437e16 303623: 06ec566dbe0e270aaaf2413c95845325915cc5c1 v: v3 --- [refs] | 2 +- trunk/drivers/net/irda/irda-usb.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index c9c4d5d1972e..15b791c1157c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d372c4197d642763a6fde0ed3baa7cfce78df22d +refs/heads/master: 3d55ea3e2233c994649d9e5dc9eff58f915cd81d diff --git a/trunk/drivers/net/irda/irda-usb.c b/trunk/drivers/net/irda/irda-usb.c index 72f687b40d66..f9a86bdb12fa 100644 --- a/trunk/drivers/net/irda/irda-usb.c +++ b/trunk/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; }