www.infradead.org Git - users/jedix/linux-maple.git/commit

author	Lothar Waßmann <LW@KARO-electronics.de>
	Thu, 21 Mar 2013 02:20:11 +0000 (02:20 +0000)
committer	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
	Fri, 5 Apr 2013 16:26:19 +0000 (09:26 -0700)
commit	4a2438e61cf83c3173766d77216b3dba25d65583
tree	209403f03e0360e61f7bb0f68fa23f771de22519	tree
parent	09269638aab0f527678426fe9258b384fe6bb103	commit \| diff

net: ethernet: cpsw: fix erroneous condition in error check

[ Upstream commit ce16294fda230c787ce5c35f61b2f80d14d70a72 ]

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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>