On 10/23/2017 11:01 AM, Vivien Didelot wrote:
> In the case of pdata, the dsa_cpu_parse function calls dev_put() before
> making sure it isn't NULL. Fix this.
>
> Fixes: 71e0bbde0d88 ("net: dsa: Add support for platform data")
> Signed-off-by: Vivien Didelot <vivien.dide...@savoirfairelinux.com>
Reviewed-by: Florian Fainelli <f.faine...@gmail.com>
Did not you want to target 'net' for that though?
> ---
> net/dsa/dsa2.c | 7 ++++---
> 1 file changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/net/dsa/dsa2.c b/net/dsa/dsa2.c
> index 9e8b8aab049d..908c06e32520 100644
> --- a/net/dsa/dsa2.c
> +++ b/net/dsa/dsa2.c
> @@ -489,14 +489,15 @@ static int dsa_cpu_parse(struct dsa_port *port, u32
> index,
> if (!ethernet)
> return -EINVAL;
> ethernet_dev = of_find_net_device_by_node(ethernet);
> + if (!ethernet_dev)
> + return -EPROBE_DEFER;
> } else {
> ethernet_dev = dsa_dev_to_net_device(ds->cd->netdev[index]);
> + if (!ethernet_dev)
> + return -EPROBE_DEFER;
> dev_put(ethernet_dev);
> }
>
> - if (!ethernet_dev)
> - return -EPROBE_DEFER;
> -
> if (!dst->cpu_dp) {
> dst->cpu_dp = port;
> dst->cpu_dp->master = ethernet_dev;
>
--
Florian
