PCI: shpchp: Rename duplicate slot name N as N-1, N-2, N-M...

[linux-2.6-omap-h63xx.git] / drivers / net / usb / rtl8150.c

diff --git a/drivers/net/usb/rtl8150.c b/drivers/net/usb/rtl8150.c
index fa598f0340cf90f5a7d9b5cca48cf0b374a988b1..df56a518691c6c9fb5664c2f972082ac84fdf693 100644 (file)
--- a/drivers/net/usb/rtl8150.c
+++ b/drivers/net/usb/rtl8150.c
@@ -376,7 +376,7 @@ static int alloc_all_urbs(rtl8150_t * dev)
                return 0;
        }
        dev->ctrl_urb = usb_alloc_urb(0, GFP_KERNEL);
-       if (!dev->intr_urb) {
+       if (!dev->ctrl_urb) {
                usb_free_urb(dev->rx_urb);
                usb_free_urb(dev->tx_urb);
                usb_free_urb(dev->intr_urb);
@@ -905,7 +905,6 @@ static int rtl8150_probe(struct usb_interface *intf,
        }
 
        dev = netdev_priv(netdev);
-       memset(dev, 0, sizeof(rtl8150_t));
 
        dev->intr_buff = kmalloc(INTBUFSIZE, GFP_KERNEL);
        if (!dev->intr_buff) {
@@ -918,7 +917,6 @@ static int rtl8150_probe(struct usb_interface *intf,
        
        dev->udev = udev;
        dev->netdev = netdev;
-       SET_MODULE_OWNER(netdev);
        netdev->open = rtl8150_open;
        netdev->stop = rtl8150_close;
        netdev->do_ioctl = rtl8150_ioctl;
@@ -928,7 +926,6 @@ static int rtl8150_probe(struct usb_interface *intf,
        netdev->set_multicast_list = rtl8150_set_multicast;
        netdev->set_mac_address = rtl8150_set_mac_address;
        netdev->get_stats = rtl8150_netdev_stats;
-       netdev->mtu = RTL8150_MTU;
        SET_ETHTOOL_OPS(netdev, &ops);
        dev->intr_interval = 100;       /* 100ms */