diff options
author | Dan Carpenter <error27@gmail.com> | 2010-08-24 02:52:46 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-08-24 17:50:26 -0400 |
commit | 4169591fd7c260b2b0b4e8f4d51f63f5b15ad78a (patch) | |
tree | 4dc87147db2e92f6b4eb9ca41813cd718ea6cdaf /drivers | |
parent | ef24b16b5d67c815874ed2d0e2581db629661ba3 (diff) |
pxa168_eth: remove unneeded null check
"pep->pd" isn't checked consistently in this function. For example it's
dereferenced unconditionally on the next line after the end of the if
condition. This function is only called from pxa168_eth_probe() and
pep->pd is always non-NULL so I removed the check.
Signed-off-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/pxa168_eth.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/pxa168_eth.c b/drivers/net/pxa168_eth.c index ecc64d750cce..857a68115a5c 100644 --- a/drivers/net/pxa168_eth.c +++ b/drivers/net/pxa168_eth.c | |||
@@ -1414,10 +1414,8 @@ static int ethernet_phy_setup(struct net_device *dev) | |||
1414 | { | 1414 | { |
1415 | struct pxa168_eth_private *pep = netdev_priv(dev); | 1415 | struct pxa168_eth_private *pep = netdev_priv(dev); |
1416 | 1416 | ||
1417 | if (pep->pd != NULL) { | 1417 | if (pep->pd->init) |
1418 | if (pep->pd->init) | 1418 | pep->pd->init(); |
1419 | pep->pd->init(); | ||
1420 | } | ||
1421 | pep->phy = phy_scan(pep, pep->pd->phy_addr & 0x1f); | 1419 | pep->phy = phy_scan(pep, pep->pd->phy_addr & 0x1f); |
1422 | if (pep->phy != NULL) | 1420 | if (pep->phy != NULL) |
1423 | phy_init(pep, pep->pd->speed, pep->pd->duplex); | 1421 | phy_init(pep, pep->pd->speed, pep->pd->duplex); |