xircom init_etherdev conversion.
- Also cleans up some exit paths.
drivers/net/tulip/xircom_cb.c +17 -18
@@ -249,32 +249,24 @@ static int __devinit xircom_probe(structThis way, we can fail gracefully if not enough memory is available. */ - private =kmalloc (sizeof (*private),GFP_KERNEL ); -memset (private,0 ,sizeof (struct xircom_private )); +if ((dev =init_etherdev (dev,sizeof (struct xircom_private ))) ==NULL ) { +printk (KERN_ERR "xircom_probe: failed to allocate etherdev\n" ); + goto device_fail; + } + private = dev->priv;/* Allocate the send/receive buffers */ private->rx_buffer =pci_alloc_consistent (pdev,8192 ,&private->rx_dma_handle); -if (private->rx_buffer ==NULL ) {printk (KERN_ERR "xircom_probe: no memory for rx buffer \n" ); -kfree (private); -return -ENODEV ; + goto rx_buf_fail; } private->tx_buffer =pci_alloc_consistent (pdev,8192 ,&private->tx_dma_handle);if (private->tx_buffer ==NULL ) {printk (KERN_ERR "xircom_probe: no memory for tx buffer \n" ); -kfree (private->rx_buffer); -kfree (private); -return -ENODEV ; - } - dev =init_etherdev (dev,0 ); -if (dev ==NULL ) { -printk (KERN_ERR "xircom_probe: failed to allocate etherdev\n" ); -kfree (private->rx_buffer); -kfree (private->tx_buffer); -kfree (private); -return -ENODEV ; + goto tx_buf_fail; } +SET_MODULE_OWNER (dev);printk (KERN_INFO "%s: Xircom cardbus revision %i at irq %i \n" , dev->name, chip_rev, pdev->irq);
@@ -304,14 +296,21 @@ static int __devinit xircom_probe(structtransceiver_voodoo (private);spin_lock_irqsave (&private->lock,flags); -activate_transmitter (private); -activate_receiver (private); +activate_transmitter (private); +activate_receiver (private);spin_unlock_irqrestore (&private->lock,flags);trigger_receive (private);leave ("xircom_probe" );return 0 ; + +tx_buf_fail: +kfree (private->rx_buffer); +rx_buf_fail: +kfree (dev); +device_fail: +return -ENODEV ; }
Quoted 1 line · [email protected] wrote:
- Also cleans up some exit paths.
...and now xircom_remove is kfree'ing memory that was never kmalloc'd
Quoted 4 lines · Jeff Garzik
Quoted 1 line · [email protected] wrote:
- Also cleans up some exit paths.
...and now
xircom_removeis kfree'ing memory that was never kmalloc'd
Which one ? I don't see it..
Dave
Quoted 7 lines · Dave Jones
Quoted 4 lines · Jeff Garzik
Quoted 1 line · [email protected] wrote:
- Also cleans up some exit paths.
...and now
xircom_removeis kfree'ing memory that was never kmalloc'dWhich one ? I don't see it..
"kfree(card)" here:
card=dev->priv;
...
kfree(card);
}
release_region(dev->base_addr, 128);
unregister_netdev(dev);
kfree(dev);
leave("xircom_remove");