Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a11da890 authored by Alexey Dobriyan's avatar Alexey Dobriyan Committed by David S. Miller
Browse files

sky2: fix hard hang with netconsoling and iface going up 



Printing anything over netconsole before hw is up and running is,
of course, not going to work.

Signed-off-by: default avatarAlexey Dobriyan <adobriyan@gmail.com>
Acked-by: default avatarStephen Hemminger <shemminger@vyatta.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f99ec064

drivers/net/sky2.c

+3 −3
Original line number Diff line number Diff line
@@ -1403,9 +1403,6 @@ static int sky2_up(struct net_device *dev) 


 	}



	if (netif_msg_ifup(sky2))

		printk(KERN_INFO PFX "%s: enabling interface\n", dev->name);



	netif_carrier_off(dev);



	/* must be power of 2 */
@@ -1484,6 +1481,9 @@ static int sky2_up(struct net_device *dev) 
	sky2_write32(hw, B0_IMSK, imask);



	sky2_set_multicast(dev);



	if (netif_msg_ifup(sky2))

		printk(KERN_INFO PFX "%s: enabling interface\n", dev->name);

	return 0;



err_out: