]> rtime.felk.cvut.cz Git - lisovros/linux_canprio.git/commitdiff
sis190: use an adequate phy list entry as a fallback
authorfrançois romieu <romieu@fr.zoreil.com>
Wed, 17 Jun 2009 11:43:11 +0000 (11:43 +0000)
committerDavid S. Miller <davem@davemloft.net>
Thu, 18 Jun 2009 01:46:46 +0000 (18:46 -0700)
When sis190 driver is trying to get default phy, if it doesn't find home
or lan phy, it falls back to the first phy in the phy list but list_entry()
points to a bogus entry. list_first_entry() should be used instead.

Signed-off-by: Arnaud Patard <apatard@mandriva.com>
Acked-off-by: Francois Romieu <romieu@fr.zoreil.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/sis190.c

index e2247669a4951ffdc385a149b248b4d8c18d5ee8..1f040e8a000ba043d2b2f41d411e0478a7a3e4b3 100644 (file)
@@ -1281,7 +1281,7 @@ static u16 sis190_default_phy(struct net_device *dev)
                else if (phy_lan)
                        phy_default = phy_lan;
                else
-                       phy_default = list_entry(&tp->first_phy,
+                       phy_default = list_first_entry(&tp->first_phy,
                                                 struct sis190_phy, list);
        }