Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[karo-tx-linux.git] / drivers / net / usb / rtl8150.c

diff --git a/drivers/net/usb/rtl8150.c b/drivers/net/usb/rtl8150.c
index fd19db0d25048216e00a31f61738c443f8424c9b..21ac103fbb71b952d0ca3a493b3ff61ec449a8df 100644 (file)
--- a/drivers/net/usb/rtl8150.c
+++ b/drivers/net/usb/rtl8150.c
@@ -313,20 +313,17 @@ static int rtl8150_set_mac_address(struct net_device *netdev, void *p)
 {
        struct sockaddr *addr = p;
        rtl8150_t *dev = netdev_priv(netdev);
-       int i;
 
        if (netif_running(netdev))
                return -EBUSY;
 
        memcpy(netdev->dev_addr, addr->sa_data, netdev->addr_len);
-       dbg("%s: Setting MAC address to ", netdev->name);
-       for (i = 0; i < 5; i++)
-               dbg("%02X:", netdev->dev_addr[i]);
-       dbg("%02X\n", netdev->dev_addr[i]);
+       dbg("%s: Setting MAC address to %pM\n", netdev->name, netdev->dev_addr);
        /* Set the IDR registers. */
        set_registers(dev, IDR, netdev->addr_len, netdev->dev_addr);
 #ifdef EEPROM_WRITE
        {
+       int i;
        u8 cr;
        /* Get the CR contents. */
        get_registers(dev, CR, 1, &cr);