staging: et131x: Fix et131x smatch issues
authorMark Einon <mark.einon@gmail.com>
Mon, 10 Oct 2011 15:21:12 +0000 (16:21 +0100)
committerGreg Kroah-Hartman <gregkh@suse.de>
Tue, 11 Oct 2011 16:10:30 +0000 (10:10 -0600)
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 <mark.einon@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/staging/et131x/et131x_initpci.c

index 9b2dc55..45ce832 100644 (file)
@@ -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) ==