diff --git a/[refs] b/[refs] index 122ca0d3b7f8..2f4edc4053db 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dad48a4ef20774732e53840f371b0cc27981c43a +refs/heads/master: 2d146eb172d5f754e3973a3f761f7619ebb12df9 diff --git a/trunk/drivers/net/s2io.c b/trunk/drivers/net/s2io.c index cc4218667cba..3c4836d0898f 100644 --- a/trunk/drivers/net/s2io.c +++ b/trunk/drivers/net/s2io.c @@ -3421,7 +3421,7 @@ static int wait_for_cmd_complete(void __iomem *addr, u64 busy_bit, break; } } else { - if (!(val64 & busy_bit)) { + if (val64 & busy_bit) { ret = SUCCESS; break; }