From owner-svn-src-stable-10@freebsd.org  Mon Jun 26 09:34:42 2017
Return-Path: <owner-svn-src-stable-10@freebsd.org>
Delivered-To: svn-src-stable-10@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 8AA20DA5B73;
 Mon, 26 Jun 2017 09:34:42 +0000 (UTC) (envelope-from avg@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 586E971270;
 Mon, 26 Jun 2017 09:34:42 +0000 (UTC) (envelope-from avg@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v5Q9YfGP023848;
 Mon, 26 Jun 2017 09:34:41 GMT (envelope-from avg@FreeBSD.org)
Received: (from avg@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v5Q9YfHK023847;
 Mon, 26 Jun 2017 09:34:41 GMT (envelope-from avg@FreeBSD.org)
Message-Id: <201706260934.v5Q9YfHK023847@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: avg set sender to avg@FreeBSD.org
 using -f
From: Andriy Gapon <avg@FreeBSD.org>
Date: Mon, 26 Jun 2017 09:34:41 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r320355 - stable/10/sys/dev/jedec_ts
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-10@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for only the 10-stable src tree
 <svn-src-stable-10.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-10/>
List-Post: <mailto:svn-src-stable-10@freebsd.org>
List-Help: <mailto:svn-src-stable-10-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 26 Jun 2017 09:34:42 -0000

Author: avg
Date: Mon Jun 26 09:34:41 2017
New Revision: 320355
URL: https://svnweb.freebsd.org/changeset/base/320355

Log:
  MFC r320259: jedec_ts: read device id from the correct register

Modified:
  stable/10/sys/dev/jedec_ts/jedec_ts.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/dev/jedec_ts/jedec_ts.c
==============================================================================
--- stable/10/sys/dev/jedec_ts/jedec_ts.c	Mon Jun 26 09:32:57 2017	(r320354)
+++ stable/10/sys/dev/jedec_ts/jedec_ts.c	Mon Jun 26 09:34:41 2017	(r320355)
@@ -114,7 +114,7 @@ ts_attach(device_t dev)
 		device_printf(dev, "failed to read Manufacturer ID\n");
 		return (ENXIO);
 	}
-	err = ts_readw_be(dev, 6, &devid);
+	err = ts_readw_be(dev, 7, &devid);
 	if (err != 0) {
 		device_printf(dev, "failed to read Device ID\n");
 		return (ENXIO);