From owner-svn-src-all@freebsd.org  Sun Nov  3 20:49:05 2019
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id 49DF91A2416;
 Sun,  3 Nov 2019 20:49:05 +0000 (UTC)
 (envelope-from wulf@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 server-signature RSA-PSS (4096 bits)
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 475p1s0dL3z4BRc;
 Sun,  3 Nov 2019 20:49:05 +0000 (UTC)
 (envelope-from wulf@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id ECDF3196AE;
 Sun,  3 Nov 2019 20:49:04 +0000 (UTC)
 (envelope-from wulf@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xA3Kn4Rv059234;
 Sun, 3 Nov 2019 20:49:04 GMT (envelope-from wulf@FreeBSD.org)
Received: (from wulf@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id xA3Kn4kO059233;
 Sun, 3 Nov 2019 20:49:04 GMT (envelope-from wulf@FreeBSD.org)
Message-Id: <201911032049.xA3Kn4kO059233@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: wulf set sender to
 wulf@FreeBSD.org using -f
From: Vladimir Kondratyev <wulf@FreeBSD.org>
Date: Sun, 3 Nov 2019 20:49:04 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r354299 - head/sys/dev/ichiic
X-SVN-Group: head
X-SVN-Commit-Author: wulf
X-SVN-Commit-Paths: head/sys/dev/ichiic
X-SVN-Commit-Revision: 354299
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 03 Nov 2019 20:49:05 -0000

Author: wulf
Date: Sun Nov  3 20:49:04 2019
New Revision: 354299
URL: https://svnweb.freebsd.org/changeset/base/354299

Log:
  [ig4] Stop I2C controller after checking that it's kind of functional.
  
  Obtained from:	DragonfliBSD (0b3eedb)

Modified:
  head/sys/dev/ichiic/ig4_iic.c

Modified: head/sys/dev/ichiic/ig4_iic.c
==============================================================================
--- head/sys/dev/ichiic/ig4_iic.c	Sun Nov  3 20:47:49 2019	(r354298)
+++ head/sys/dev/ichiic/ig4_iic.c	Sun Nov  3 20:49:04 2019	(r354299)
@@ -605,6 +605,11 @@ ig4iic_attach(ig4iic_softc_t *sc)
 		error = ENXIO;
 		goto done;
 	}
+	if (set_controller(sc, 0)) {
+		device_printf(sc->dev, "controller error during attach-3\n");
+		error = ENXIO;
+		goto done;
+	}
 	error = bus_setup_intr(sc->dev, sc->intr_res, INTR_TYPE_MISC | INTR_MPSAFE,
 			       NULL, ig4iic_intr, sc, &sc->intr_handle);
 	if (error) {