aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/net/usb/rtl8150.c15
1 files changed, 8 insertions, 7 deletions
diff --git a/drivers/net/usb/rtl8150.c b/drivers/net/usb/rtl8150.c
index d363b31053da..65854cdcedc8 100644
--- a/drivers/net/usb/rtl8150.c
+++ b/drivers/net/usb/rtl8150.c
@@ -203,7 +203,8 @@ static int async_set_registers(rtl8150_t * dev, u16 indx, u16 size)
203 if ((ret = usb_submit_urb(dev->ctrl_urb, GFP_ATOMIC))) { 203 if ((ret = usb_submit_urb(dev->ctrl_urb, GFP_ATOMIC))) {
204 if (ret == -ENODEV) 204 if (ret == -ENODEV)
205 netif_device_detach(dev->netdev); 205 netif_device_detach(dev->netdev);
206 err("control request submission failed: %d", ret); 206 dev_err(&dev->udev->dev,
207 "control request submission failed: %d\n", ret);
207 } else 208 } else
208 set_bit(RX_REG_SET, &dev->flags); 209 set_bit(RX_REG_SET, &dev->flags);
209 210
@@ -516,9 +517,9 @@ resubmit:
516 if (res == -ENODEV) 517 if (res == -ENODEV)
517 netif_device_detach(dev->netdev); 518 netif_device_detach(dev->netdev);
518 else if (res) 519 else if (res)
519 err ("can't resubmit intr, %s-%s/input0, status %d", 520 dev_err(&dev->udev->dev,
520 dev->udev->bus->bus_name, 521 "can't resubmit intr, %s-%s/input0, status %d\n",
521 dev->udev->devpath, res); 522 dev->udev->bus->bus_name, dev->udev->devpath, res);
522} 523}
523 524
524static int rtl8150_suspend(struct usb_interface *intf, pm_message_t message) 525static int rtl8150_suspend(struct usb_interface *intf, pm_message_t message)
@@ -890,11 +891,11 @@ static int rtl8150_probe(struct usb_interface *intf,
890 dev->intr_interval = 100; /* 100ms */ 891 dev->intr_interval = 100; /* 100ms */
891 892
892 if (!alloc_all_urbs(dev)) { 893 if (!alloc_all_urbs(dev)) {
893 err("out of memory"); 894 dev_err(&intf->dev, "out of memory\n");
894 goto out; 895 goto out;
895 } 896 }
896 if (!rtl8150_reset(dev)) { 897 if (!rtl8150_reset(dev)) {
897 err("couldn't reset the device"); 898 dev_err(&intf->dev, "couldn't reset the device\n");
898 goto out1; 899 goto out1;
899 } 900 }
900 fill_skb_pool(dev); 901 fill_skb_pool(dev);
@@ -903,7 +904,7 @@ static int rtl8150_probe(struct usb_interface *intf,
903 usb_set_intfdata(intf, dev); 904 usb_set_intfdata(intf, dev);
904 SET_NETDEV_DEV(netdev, &intf->dev); 905 SET_NETDEV_DEV(netdev, &intf->dev);
905 if (register_netdev(netdev) != 0) { 906 if (register_netdev(netdev) != 0) {
906 err("couldn't register the device"); 907 dev_err(&intf->dev, "couldn't register the device\n");
907 goto out2; 908 goto out2;
908 } 909 }
909 910