|
@@ -2873,8 +2873,7 @@ static int lan78xx_bind(struct lan78xx_net *dev, struct usb_interface *intf)
|
|
|
if (ret < 0) {
|
|
|
netdev_warn(dev->net,
|
|
|
"lan78xx_setup_irq_domain() failed : %d", ret);
|
|
|
- kfree(pdata);
|
|
|
- return ret;
|
|
|
+ goto out1;
|
|
|
}
|
|
|
|
|
|
dev->net->hard_header_len += TX_OVERHEAD;
|
|
@@ -2882,14 +2881,32 @@ static int lan78xx_bind(struct lan78xx_net *dev, struct usb_interface *intf)
|
|
|
|
|
|
/* Init all registers */
|
|
|
ret = lan78xx_reset(dev);
|
|
|
+ if (ret) {
|
|
|
+ netdev_warn(dev->net, "Registers INIT FAILED....");
|
|
|
+ goto out2;
|
|
|
+ }
|
|
|
|
|
|
ret = lan78xx_mdio_init(dev);
|
|
|
+ if (ret) {
|
|
|
+ netdev_warn(dev->net, "MDIO INIT FAILED.....");
|
|
|
+ goto out2;
|
|
|
+ }
|
|
|
|
|
|
dev->net->flags |= IFF_MULTICAST;
|
|
|
|
|
|
pdata->wol = WAKE_MAGIC;
|
|
|
|
|
|
return ret;
|
|
|
+
|
|
|
+out2:
|
|
|
+ lan78xx_remove_irq_domain(dev);
|
|
|
+
|
|
|
+out1:
|
|
|
+ netdev_warn(dev->net, "Bind routine FAILED");
|
|
|
+ cancel_work_sync(&pdata->set_multicast);
|
|
|
+ cancel_work_sync(&pdata->set_vlan);
|
|
|
+ kfree(pdata);
|
|
|
+ return ret;
|
|
|
}
|
|
|
|
|
|
static void lan78xx_unbind(struct lan78xx_net *dev, struct usb_interface *intf)
|
|
@@ -2901,6 +2918,8 @@ static void lan78xx_unbind(struct lan78xx_net *dev, struct usb_interface *intf)
|
|
|
lan78xx_remove_mdio(dev);
|
|
|
|
|
|
if (pdata) {
|
|
|
+ cancel_work_sync(&pdata->set_multicast);
|
|
|
+ cancel_work_sync(&pdata->set_vlan);
|
|
|
netif_dbg(dev, ifdown, dev->net, "free pdata");
|
|
|
kfree(pdata);
|
|
|
pdata = NULL;
|