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

Commit 4d03b446 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'davem.r8169' of git://git.kernel.org/pub/scm/linux/kernel/git/romieu/netdev-2.6

parents acc468f5 1e4e82ba

drivers/net/r8169.c

+1 −1
Original line number Diff line number Diff line
@@ -742,7 +742,7 @@ static void rtl8168_oob_notify(struct rtl8169_private *tp, u8 cmd) 
	msleep(2);

	for (i = 0; i < 5; i++) {

		udelay(100);

		if (!(RTL_R32(ERIDR) & ERIAR_FLAG))

		if (!(RTL_R32(ERIAR) & ERIAR_FLAG))

			break;

	}