diff --git a/[refs] b/[refs] index a4665746e96c..595c72ad24bb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d5fe488a7b59e41b98b91137805159466b7b49c2 +refs/heads/master: 22435849a6dcde2ce10d1870aba461a54e347fe3 diff --git a/trunk/drivers/net/tg3.c b/trunk/drivers/net/tg3.c index 89d897d679e8..07bf05673da7 100644 --- a/trunk/drivers/net/tg3.c +++ b/trunk/drivers/net/tg3.c @@ -2400,8 +2400,7 @@ static int tg3_set_power_state(struct tg3 *tp, pci_power_t state) } if (!(device_should_wake) && - !(tp->tg3_flags & TG3_FLAG_ENABLE_ASF) && - !(tp->tg3_flags3 & TG3_FLG3_ENABLE_APE)) + !(tp->tg3_flags & TG3_FLAG_ENABLE_ASF)) tg3_power_down_phy(tp, do_low_power); tg3_frob_aux_power(tp);