PERFORCE change 231487 for review

[Brooks Davis]

http://p4web.freebsd.org/@@231487?ac=10

Change 231487 by brooks at brooks_zenith on 2013/07/26 15:46:34

	Correct a merge error.  We only need to unlock the block once on
	Intel parts...

Affected files ...

.. //depot/projects/ctsrd/beribsd/src/sys/dev/cfi/cfi_core.c#16 edit

Differences ...

==== //depot/projects/ctsrd/beribsd/src/sys/dev/cfi/cfi_core.c#16 (text+ko) ====

@@ -462,15 +462,6 @@
 		break;
 	}
 
-	switch (sc->sc_cmdset) {
-	case CFI_VEND_INTEL_ECS:
-	case CFI_VEND_INTEL_SCS:
-		cfi_write(sc, sc->sc_wrofs, CFI_INTEL_LBS);
-		cfi_write(sc, sc->sc_wrofs, CFI_INTEL_UB);
-		cfi_write(sc, sc->sc_wrofs, CFI_BCS_READ_ARRAY);
-		break;
-	}
-
 	/* Check if an erase is required. */
 	for (i = 0; i < sc->sc_wrbufsz; i++)
 		if ((sc->sc_wrbuf[i] & sc->sc_wrbufcpy[i]) != sc->sc_wrbuf[i]) {