Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 268775
b: refs/heads/master
c: 33fd472
h: refs/heads/master
i:
  268773: 0b0ab90
  268771: 0d437eb
  268767: 78f0e70
v: v3
  • Loading branch information
Mark Einon authored and Greg Kroah-Hartman committed Oct 11, 2011
1 parent f89521c commit bbe0868
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 6617c3698778ae896deb89804f7ba8efb4d2252d
refs/heads/master: 33fd472ee7b98ac187f0fcee33d97a187bdbaa08
4 changes: 2 additions & 2 deletions trunk/drivers/staging/et131x/et131x_initpci.c
Original file line number Diff line number Diff line change
Expand Up @@ -485,7 +485,7 @@ static void et131x_adjust_link(struct net_device *netdev)
et1310_config_mac_regs2(adapter);
}

if (phydev->link != adapter->link) {
if (phydev && phydev->link != adapter->link) {
/*
* Check to see if we are in coma mode and if
* so, disable it because we will not be able
Expand All @@ -501,7 +501,7 @@ static void et131x_adjust_link(struct net_device *netdev)
"Link down - cable problem ?\n");
adapter->boot_coma = 0;

if (phydev && phydev->speed == SPEED_10) {
if (phydev->speed == SPEED_10) {
/* NOTE - Is there a way to query this without
* TruePHY?
* && TRU_QueryCoreType(adapter->hTruePhy, 0) ==
Expand Down

0 comments on commit bbe0868

Please sign in to comment.