Commit 0b29b894 authored by Tobias Klauser's avatar Tobias Klauser Committed by David S. Miller
Browse files

sunhme: Use return value of register_netdev 



Use the return value provided by register_netdev on error instead of
using a previously set value.

Signed-off-by: default avatarTobias Klauser <tklauser@distanz.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent cb5d991a

drivers/net/sunhme.c

+4 −2
Original line number Diff line number Diff line
@@ -2808,7 +2808,8 @@ static int __devinit happy_meal_sbus_probe_one(struct platform_device *op, int i 
	happy_meal_set_initial_advertisement(hp);

	spin_unlock_irq(&hp->happy_lock);



	if (register_netdev(hp->dev)) {

	err = register_netdev(hp->dev);

	if (err) {

		printk(KERN_ERR "happymeal: Cannot register net device, "

		       "aborting.\n");

		goto err_out_free_coherent;
@@ -3130,7 +3131,8 @@ static int __devinit happy_meal_pci_probe(struct pci_dev *pdev, 
	happy_meal_set_initial_advertisement(hp);

	spin_unlock_irq(&hp->happy_lock);



	if (register_netdev(hp->dev)) {

	err = register_netdev(hp->dev);

	if (err) {

		printk(KERN_ERR "happymeal(PCI): Cannot register net device, "

		       "aborting.\n");

		goto err_out_iounmap;