From: David S. Miller <davem@davemloft.net>
Date: Fri, 12 Dec 2014 02:00:13 +0000 (-0500)
Subject: Merge branch 'dsa'
X-Git-Tag: firefly_0821_release~176^2~2693^2~12
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=c11a9009ae6a8c42a8cd69d885601e1aa6fbea04;p=firefly-linux-kernel-4.4.55.git

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>
---

c11a9009ae6a8c42a8cd69d885601e1aa6fbea04