net: ethernet: cpsw: fix erroneous condition in error check
authorLothar Waßmann <LW@KARO-electronics.de>
Thu, 21 Mar 2013 02:20:11 +0000 (02:20 +0000)
committerDavid S. Miller <davem@davemloft.net>
Thu, 21 Mar 2013 15:57:42 +0000 (11:57 -0400)
commitce16294fda230c787ce5c35f61b2f80d14d70a72
tree99a974957b09721e0379f58ca25da4e5ee68fe0d
parentcb0e51d80694fc9964436be1a1a15275e991cb1e
net: ethernet: cpsw: fix erroneous condition in error check

The error check in cpsw_probe_dt() has an '&&' where an '||' is
meant to be. This causes a NULL pointer dereference when incomplet DT
data is passed to the driver ('phy_id' property for cpsw_emac1
missing).

Signed-off-by: Lothar Waßmann <LW@KARO-electronics.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/ti/cpsw.c