From bbe086862bf6c42fabdcf379a4c5c17695ea949f Mon Sep 17 00:00:00 2001 From: Mark Einon Date: Mon, 10 Oct 2011 16:21:12 +0100 Subject: [PATCH] --- yaml --- r: 268775 b: refs/heads/master c: 33fd472ee7b98ac187f0fcee33d97a187bdbaa08 h: refs/heads/master i: 268773: 0b0ab90b0829cafb188209f830af84a7c1250687 268771: 0d437eb7f738dc0c5f2fd05bf5feecef9e7faf08 268767: 78f0e700a98fc55233578ee2c7454a8f8d671af8 v: v3 --- [refs] | 2 +- trunk/drivers/staging/et131x/et131x_initpci.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 97fadf8e0464..1247f5cc1e00 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6617c3698778ae896deb89804f7ba8efb4d2252d +refs/heads/master: 33fd472ee7b98ac187f0fcee33d97a187bdbaa08 diff --git a/trunk/drivers/staging/et131x/et131x_initpci.c b/trunk/drivers/staging/et131x/et131x_initpci.c index 9b2dc55ecbe4..45ce8321f31b 100644 --- a/trunk/drivers/staging/et131x/et131x_initpci.c +++ b/trunk/drivers/staging/et131x/et131x_initpci.c @@ -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 @@ -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) ==