From patchwork Tue Jun 21 00:16:31 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Hutchings X-Patchwork-Id: 638350 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3rYSwf6hYXz9sDk for ; Tue, 21 Jun 2016 10:17:38 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932946AbcFUARf (ORCPT ); Mon, 20 Jun 2016 20:17:35 -0400 Received: from ducie-dc1.codethink.co.uk ([185.25.241.215]:56279 "EHLO ducie-dc1.codethink.co.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932937AbcFUARc (ORCPT ); Mon, 20 Jun 2016 20:17:32 -0400 Received: from localhost (localhost [127.0.0.1]) by ducie-dc1.codethink.co.uk (Postfix) with ESMTP id 170B84628B3; Tue, 21 Jun 2016 01:16:33 +0100 (BST) X-Virus-Scanned: Debian amavisd-new at ducie-dc1.codethink.co.uk Received: from ducie-dc1.codethink.co.uk ([127.0.0.1]) by localhost (ducie-dc1.codethink.co.uk [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id z5+WtkHzj0jm; Tue, 21 Jun 2016 01:16:30 +0100 (BST) Received: from xylophone (shadbolt.e.decadent.org.uk [88.96.1.126]) by ducie-dc1.codethink.co.uk (Postfix) with ESMTPSA id 90C534627A8; Tue, 21 Jun 2016 01:16:30 +0100 (BST) Message-ID: <1466468191.26723.19.camel@codethink.co.uk> Subject: [PATCH net-next] ti_cpsw: Check for disabled child nodes From: Ben Hutchings To: Mugunthan V N , Sekhar Nori Cc: netdev@vger.kernel.org, CT kernel Date: Tue, 21 Jun 2016 01:16:31 +0100 Organization: Codethink Ltd. X-Mailer: Evolution 3.12.9-1+b1 Mime-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Dual MAC devices don't necessarily have both MACs wired up, so ignore those that are disabled. Signed-off-by: Ben Hutchings --- a/drivers/net/ethernet/ti/cpsw.c +++ b/drivers/net/ethernet/ti/cpsw.c @@ -2023,7 +2023,7 @@ static int cpsw_probe_dt(struct cpsw_pri if (ret) dev_warn(&pdev->dev, "Doesn't have any child node\n"); - for_each_child_of_node(node, slave_node) { + for_each_available_child_of_node(node, slave_node) { struct cpsw_slave_data *slave_data = data->slave_data + i; const void *mac_addr = NULL; int lenp;