From owner-svn-src-all@FreeBSD.ORG  Sat Oct 27 23:36:41 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 D1A986B9;
 Sat, 27 Oct 2012 23:36:41 +0000 (UTC)
 (envelope-from jmallett@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
 by mx1.freebsd.org (Postfix) with ESMTP id B49A48FC08;
 Sat, 27 Oct 2012 23:36:41 +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 q9RNafZS082449;
 Sat, 27 Oct 2012 23:36:41 GMT
 (envelope-from jmallett@svn.freebsd.org)
Received: (from jmallett@localhost)
 by svn.freebsd.org (8.14.4/8.14.4/Submit) id q9RNafh1082447;
 Sat, 27 Oct 2012 23:36:41 GMT
 (envelope-from jmallett@svn.freebsd.org)
Message-Id: <201210272336.q9RNafh1082447@svn.freebsd.org>
From: Juli Mallett <jmallett@FreeBSD.org>
Date: Sat, 27 Oct 2012 23:36:41 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r242201 - head/sys/mips/cavium
X-SVN-Group: head
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.14
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/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: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 27 Oct 2012 23:36:41 -0000

Author: jmallett
Date: Sat Oct 27 23:36:41 2012
New Revision: 242201
URL: http://svn.freebsd.org/changeset/base/242201

Log:
  Add missing return that broke 8-bit CF support in refactoring in r222671.
  Tested on a Cavium CN5860-EVB-NIC4.  This was broken for over a year.

Modified:
  head/sys/mips/cavium/octeon_ebt3000_cf.c

Modified: head/sys/mips/cavium/octeon_ebt3000_cf.c
==============================================================================
--- head/sys/mips/cavium/octeon_ebt3000_cf.c	Sat Oct 27 23:34:18 2012	(r242200)
+++ head/sys/mips/cavium/octeon_ebt3000_cf.c	Sat Oct 27 23:36:41 2012	(r242201)
@@ -280,6 +280,7 @@ static void cf_outb_8(int port, uint8_t 
 	if (bus_type == CF_8) {
 		volatile uint8_t *task_file = (volatile uint8_t *)base_addr;
 		task_file[port] = val;
+		return;
 	}
 
 	/*