From owner-svn-src-head@freebsd.org  Sat May  6 06:07:45 2017
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id DB641D60814;
 Sat,  6 May 2017 06:07:45 +0000 (UTC)
 (envelope-from adrian@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id AAD11120;
 Sat,  6 May 2017 06:07:45 +0000 (UTC)
 (envelope-from adrian@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v4667ilA082852;
 Sat, 6 May 2017 06:07:44 GMT (envelope-from adrian@FreeBSD.org)
Received: (from adrian@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v4667ics082851;
 Sat, 6 May 2017 06:07:44 GMT (envelope-from adrian@FreeBSD.org)
Message-Id: <201705060607.v4667ics082851@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: adrian set sender to
 adrian@FreeBSD.org using -f
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Sat, 6 May 2017 06:07:44 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r317869 - head/sys/dev/etherswitch/e6000sw
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 06 May 2017 06:07:46 -0000

Author: adrian
Date: Sat May  6 06:07:44 2017
New Revision: 317869
URL: https://svnweb.freebsd.org/changeset/base/317869

Log:
  [etherswitch] [e6000sw] fix compile issue under clang/arm
  
  Submitted by:	Hiroki Mori <yamori813@yahoo.co.jp>
  Approved by:	mizhka
  Differential Revision:	https://reviews.freebsd.org/D10563

Modified:
  head/sys/dev/etherswitch/e6000sw/e6060sw.c

Modified: head/sys/dev/etherswitch/e6000sw/e6060sw.c
==============================================================================
--- head/sys/dev/etherswitch/e6000sw/e6060sw.c	Sat May  6 06:06:11 2017	(r317868)
+++ head/sys/dev/etherswitch/e6000sw/e6060sw.c	Sat May  6 06:07:44 2017	(r317869)
@@ -169,6 +169,7 @@ e6060sw_probe(device_t dev)
 	sc = device_get_softc(dev);
 	bzero(sc, sizeof(*sc));
 
+	devid = 0;
 	for (i = 0; i < 2; ++i) {
 		data = MDIO_READREG(device_get_parent(dev), 
 		    CORE_REGISTER + i * 0x10, SWITCH_ID);
@@ -184,8 +185,6 @@ e6060sw_probe(device_t dev)
 			break;
 		}
 	}
-	if (i == 2)
-		return (ENXIO);
 
 	if (devid == E6060)
 		devname = "88E6060";
@@ -193,6 +192,9 @@ e6060sw_probe(device_t dev)
 		devname = "88E6063";
 	else if (devid == E6065)
 		devname = "88E6065";
+	else
+		return (ENXIO);
+
 	sprintf(desc, "Marvell %s MDIO switch driver at 0x%02x",
 	    devname, sc->smi_offset);
 	device_set_desc_copy(dev, desc);