From ee020848ea3213e2392b11480773d5cb1d19ca7a Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 25 Apr 2012 14:48:51 -0700 Subject: [PATCH] --- yaml --- r: 303631 b: refs/heads/master c: 46267f4caa5fdf546a94b99b4c53c9424d2d4291 h: refs/heads/master i: 303629: 21317d433e50db80cba2f8d0afe2fee1131ab1a7 303627: af2484349d6a4aae68bb03625d9e767b4b7556bc 303623: 06ec566dbe0e270aaaf2413c95845325915cc5c1 303615: 40021884a67a4dc23daeb6f4d68ce22758be10ab v: v3 --- [refs] | 2 +- trunk/drivers/net/irda/stir4200.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index df359cdc6105..af53efafac85 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d867c43e248fa9369eb40c443eeb5e8bdd717b04 +refs/heads/master: 46267f4caa5fdf546a94b99b4c53c9424d2d4291 diff --git a/trunk/drivers/net/irda/stir4200.c b/trunk/drivers/net/irda/stir4200.c index e6e59a078ef4..876e709b65ba 100644 --- a/trunk/drivers/net/irda/stir4200.c +++ b/trunk/drivers/net/irda/stir4200.c @@ -904,7 +904,7 @@ static int stir_net_open(struct net_device *netdev) sprintf(hwname, "usb#%d", stir->usbdev->devnum); stir->irlap = irlap_open(netdev, &stir->qos, hwname); if (!stir->irlap) { - err("stir4200: irlap_open failed"); + dev_err(&stir->usbdev->dev, "irlap_open failed\n"); goto err_out5; } @@ -913,7 +913,7 @@ static int stir_net_open(struct net_device *netdev) "%s", stir->netdev->name); if (IS_ERR(stir->thread)) { err = PTR_ERR(stir->thread); - err("stir4200: unable to start kernel thread"); + dev_err(&stir->usbdev->dev, "unable to start kernel thread\n"); goto err_out6; } @@ -1042,7 +1042,7 @@ static int stir_probe(struct usb_interface *intf, ret = usb_reset_configuration(dev); if (ret != 0) { - err("stir4200: usb reset configuration failed"); + dev_err(&intf->dev, "usb reset configuration failed\n"); goto err_out2; }