xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Browse Source 
Conflicts:
	drivers/net/Kconfig
This commit is contained in:
David S. Miller
2009-02-03 00:15:35 -08:00
parent 1bded710a5 fb53fde976
commit b3ff29d2cc
583 changed files with 14384 additions and 6099 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/tsi108_eth.c
View File

@@ -1237,7 +1237,7 @@ static void tsi108_init_phy(struct net_device *dev)
spin_lock_irqsave(&phy_lock, flags);
tsi108_write_mii(data, MII_BMCR, BMCR_RESET);
while (i--){
while (--i) {
if(!(tsi108_read_mii(data, MII_BMCR) & BMCR_RESET))
break;
udelay(10);