diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2010-06-28 10:35:58 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2010-06-28 10:35:58 +0200 |
commit | 40aad62d1c2d0b49ab16d6891bbcbb3b39a56df9 (patch) | |
tree | f4b4ff7345379b62e29ff59b05c313a1ecaadbf6 /drivers/net/usb/asix.c | |
parent | 1a6fc8feb61c7fb27d206851baf60e3e60c2c90a (diff) | |
parent | 112d65d3d2bde37529e61d6ad3011c39a1f65589 (diff) | |
download | barebox-40aad62d1c2d0b49ab16d6891bbcbb3b39a56df9.tar.gz barebox-40aad62d1c2d0b49ab16d6891bbcbb3b39a56df9.tar.xz |
Merge remote branch 'origin/assorted-pu' into next
Diffstat (limited to 'drivers/net/usb/asix.c')
-rw-r--r-- | drivers/net/usb/asix.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/usb/asix.c b/drivers/net/usb/asix.c index fc4146fdbc..ca71b34e12 100644 --- a/drivers/net/usb/asix.c +++ b/drivers/net/usb/asix.c @@ -415,13 +415,13 @@ static int asix_rx_fixup(struct usbnet *dev, void *buf, int len) while (len > 0) { if ((short)(header & 0x0000ffff) != ~((short)((header & 0xffff0000) >> 16))) - dev_err(&dev->dev, "asix_rx_fixup() Bad Header Length"); - + dev_err(&dev->edev.dev, "asix_rx_fixup() Bad Header Length"); + /* get the packet length */ size = (unsigned short) (header & 0x0000ffff); if (size > 1514) { - dev_err(&dev->dev, "asix_rx_fixup() Bad RX Length %d", size); + dev_err(&dev->edev.dev, "asix_rx_fixup() Bad RX Length %d", size); return 0; } @@ -440,7 +440,7 @@ static int asix_rx_fixup(struct usbnet *dev, void *buf, int len) } if (len < 0) { - dev_err(&dev->dev,"asix_rx_fixup() Bad SKB Length %d", len); + dev_err(&dev->edev.dev,"asix_rx_fixup() Bad SKB Length %d", len); return -1; } return 0; @@ -503,13 +503,13 @@ static int ax88172_bind(struct usbnet *dev) unsigned long gpio_bits = dev->driver_info->data; struct asix_data *data = (struct asix_data *)&dev->data; - dev_dbg(&dev->dev, "%s\n", __func__); + dev_dbg(&dev->edev.dev, "%s\n", __func__); data->eeprom_len = AX88172_EEPROM_LEN; ret = usbnet_get_endpoints(dev); if (ret) { - dev_err(&dev->dev, "can not get EPs\n"); + dev_err(&dev->edev.dev, "can not get EPs\n"); return ret; } |