From patchwork Tue Feb 26 14:06:20 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Mack X-Patchwork-Id: 223227 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 77B382C0295 for ; Wed, 27 Feb 2013 01:16:28 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758220Ab3BZOQY (ORCPT ); Tue, 26 Feb 2013 09:16:24 -0500 Received: from svenfoo.org ([82.94.215.22]:56841 "EHLO mail.zonque.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757122Ab3BZOQY (ORCPT ); Tue, 26 Feb 2013 09:16:24 -0500 X-Greylist: delayed 581 seconds by postgrey-1.27 at vger.kernel.org; Tue, 26 Feb 2013 09:16:23 EST Received: from localhost (localhost [127.0.0.1]) by mail.zonque.de (Postfix) with ESMTP id 16EAFC0127; Tue, 26 Feb 2013 15:06:39 +0100 (CET) Received: from mail.zonque.de ([127.0.0.1]) by localhost (rambrand.bugwerft.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id xHBb0Mj4HS3l; Tue, 26 Feb 2013 15:06:39 +0100 (CET) Received: from tamtam.teufel.local (p5099deeb.dip0.t-ipconnect.de [80.153.222.235]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.zonque.de (Postfix) with ESMTPSA id A1C29C0123; Tue, 26 Feb 2013 15:06:38 +0100 (CET) From: Daniel Mack To: netdev@vger.kernel.org Cc: Daniel Mack , Mugunthan V N , "David S. Miller" Subject: [PATCH] drivers: net: ethernet: cpsw: consider number of slaves in interation Date: Tue, 26 Feb 2013 15:06:20 +0100 Message-Id: <1361887580-1770-1-git-send-email-zonque@gmail.com> X-Mailer: git-send-email 1.8.1.2 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Make cpsw_add_default_vlan() look at the actual number of slaves for its iteration, so boards with less than 2 slaves don't ooops at boot. Signed-off-by: Daniel Mack Cc: Mugunthan V N Cc: David S. Miller Acked-by: Mugunthan V N --- drivers/net/ethernet/ti/cpsw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/ti/cpsw.c b/drivers/net/ethernet/ti/cpsw.c index 7e93df6..01ffbc4 100644 --- a/drivers/net/ethernet/ti/cpsw.c +++ b/drivers/net/ethernet/ti/cpsw.c @@ -731,7 +731,7 @@ static inline void cpsw_add_default_vlan(struct cpsw_priv *priv) writel(vlan, &priv->host_port_regs->port_vlan); - for (i = 0; i < 2; i++) + for (i = 0; i < priv->data.slaves; i++) slave_write(priv->slaves + i, vlan, reg); cpsw_ale_add_vlan(priv->ale, vlan, ALE_ALL_PORTS << port,