From 33fd472ee7b98ac187f0fcee33d97a187bdbaa08 Mon Sep 17 00:00:00 2001 From: Mark Einon Date: Mon, 10 Oct 2011 16:21:12 +0100 Subject: staging: et131x: Fix et131x smatch issues This fixes the following issues: et131x_initpci.c +488 et131x_adjust_link(45) error: we previously assumed 'phydev' could be null. et131x_initpci.c +504 et131x_adjust_link(61) warn: variable dereferenced before check 'phydev' Signed-off-by: Mark Einon Signed-off-by: Greg Kroah-Hartman --- drivers/staging/et131x/et131x_initpci.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'drivers/staging/et131x') diff --git a/drivers/staging/et131x/et131x_initpci.c b/drivers/staging/et131x/et131x_initpci.c index 9b2dc55ecbe..45ce8321f31 100644 --- a/drivers/staging/et131x/et131x_initpci.c +++ b/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) == -- cgit v1.2.3