From owner-svn-src-all@FreeBSD.ORG  Mon Jun 18 20:19:08 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 04440106564A;
	Mon, 18 Jun 2012 20:19:08 +0000 (UTC)
	(envelope-from marius@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id E3FE18FC17;
	Mon, 18 Jun 2012 20:19:07 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q5IKJ7qB098729;
	Mon, 18 Jun 2012 20:19:07 GMT (envelope-from marius@svn.freebsd.org)
Received: (from marius@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q5IKJ7LL098727;
	Mon, 18 Jun 2012 20:19:07 GMT (envelope-from marius@svn.freebsd.org)
Message-Id: <201206182019.q5IKJ7LL098727@svn.freebsd.org>
From: Marius Strobl <marius@FreeBSD.org>
Date: Mon, 18 Jun 2012 20:19:07 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r237240 - head/sys/dev/flash
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
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: <http://lists.freebsd.org/mailman/listinfo/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: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 18 Jun 2012 20:19:08 -0000

Author: marius
Date: Mon Jun 18 20:19:07 2012
New Revision: 237240
URL: http://svn.freebsd.org/changeset/base/237240

Log:
  Revert r236529, re-enabling verification of the flashed content as
  the underlying problem was dealt with in r237239 (in fact, disabling
  verification also actually only made the problem less likely to occur).

Modified:
  head/sys/dev/flash/at45d.c

Modified: head/sys/dev/flash/at45d.c
==============================================================================
--- head/sys/dev/flash/at45d.c	Mon Jun 18 20:14:42 2012	(r237239)
+++ head/sys/dev/flash/at45d.c	Mon Jun 18 20:19:07 2012	(r237240)
@@ -390,7 +390,6 @@ at45d_task(void *arg)
 				berr = EIO;
 				goto out;
 			}
-#ifdef notyet /* May cause physwr to hang for reasons unknown. */
 			if (bp->bio_cmd == BIO_WRITE) {
 				addr = page << sc->pageoffset;
 				txBuf[0] = BUFFER_COMPARE;
@@ -409,7 +408,6 @@ at45d_task(void *arg)
 					goto out;
 				}
 			}
-#endif
 			page++;
 			buf += len;
 			offset = 0;