mirror of
				https://github.com/torvalds/linux.git
				synced 2025-11-04 10:40:15 +02:00 
			
		
		
		
	usbnet: run unbind() before unregister_netdev()
unbind() is the proper place to disconnect PHY, but it will fail if netdev is already unregistered. Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
		
							parent
							
								
									06edf1a940
								
							
						
					
					
						commit
						2c9d6c2b87
					
				
					 1 changed files with 3 additions and 3 deletions
				
			
		| 
						 | 
					@ -1597,6 +1597,9 @@ void usbnet_disconnect (struct usb_interface *intf)
 | 
				
			||||||
		   xdev->bus->bus_name, xdev->devpath,
 | 
							   xdev->bus->bus_name, xdev->devpath,
 | 
				
			||||||
		   dev->driver_info->description);
 | 
							   dev->driver_info->description);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						if (dev->driver_info->unbind)
 | 
				
			||||||
 | 
							dev->driver_info->unbind(dev, intf);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	net = dev->net;
 | 
						net = dev->net;
 | 
				
			||||||
	unregister_netdev (net);
 | 
						unregister_netdev (net);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1604,9 +1607,6 @@ void usbnet_disconnect (struct usb_interface *intf)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	usb_scuttle_anchored_urbs(&dev->deferred);
 | 
						usb_scuttle_anchored_urbs(&dev->deferred);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	if (dev->driver_info->unbind)
 | 
					 | 
				
			||||||
		dev->driver_info->unbind (dev, intf);
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
	usb_kill_urb(dev->interrupt);
 | 
						usb_kill_urb(dev->interrupt);
 | 
				
			||||||
	usb_free_urb(dev->interrupt);
 | 
						usb_free_urb(dev->interrupt);
 | 
				
			||||||
	kfree(dev->padding_pkt);
 | 
						kfree(dev->padding_pkt);
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in a new issue