Merge branch 'dsa'
authorDavid S. Miller <davem@davemloft.net>
Fri, 12 Dec 2014 02:00:13 +0000 (21:00 -0500)
committerDavid S. Miller <davem@davemloft.net>
Fri, 12 Dec 2014 02:00:13 +0000 (21:00 -0500)
commitc11a9009ae6a8c42a8cd69d885601e1aa6fbea04
tree2298b1c69843267ef079f7d7486caf1f3e433c79
parent70e71ca0af244f48a5dcf56dc435243792e3a495
parent9697f1cde9901c00298fd1313b4aaf96f287bf7a
Merge branch 'dsa'

Florian Fainelli says:

====================
net: dsa: two small bug fixes

Here are two small fixes for the DSA slave interface creation code:

- first patch fixes a null pointer de-reference with an invalid PHY
  device pointer while calling phy_connect_direct()

- second path propagates the dsa_slave_phy_setup() error code down to
  its caller: dsa_slave_create
====================

Signed-off-by: David S. Miller <davem@davemloft.net>