Merge tag 'dt2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[cascardo/linux.git] / drivers / net / irda / stir4200.c

diff --git a/drivers/net/irda/stir4200.c b/drivers/net/irda/stir4200.c
index e6e59a0..876e709 100644 (file)
--- a/drivers/net/irda/stir4200.c
+++ b/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;
        }