From owner-svn-src-user@FreeBSD.ORG  Thu Dec  1 19:57:14 2011
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 09E2E106566B;
	Thu,  1 Dec 2011 19:57:14 +0000 (UTC)
	(envelope-from sbruno@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id EE1A18FC0A;
	Thu,  1 Dec 2011 19:57:13 +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 pB1JvDtJ059643;
	Thu, 1 Dec 2011 19:57:13 GMT (envelope-from sbruno@svn.freebsd.org)
Received: (from sbruno@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id pB1JvDjL059641;
	Thu, 1 Dec 2011 19:57:13 GMT (envelope-from sbruno@svn.freebsd.org)
Message-Id: <201112011957.pB1JvDjL059641@svn.freebsd.org>
From: Sean Bruno <sbruno@FreeBSD.org>
Date: Thu, 1 Dec 2011 19:57:13 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r228186 - user/sbruno/1394dev/fwcontrol
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 01 Dec 2011 19:57:14 -0000

Author: sbruno
Date: Thu Dec  1 19:57:13 2011
New Revision: 228186
URL: http://svn.freebsd.org/changeset/base/228186

Log:
  Open the device before calling detect_recv_fn()

Modified:
  user/sbruno/1394dev/fwcontrol/fwcontrol.c

Modified: user/sbruno/1394dev/fwcontrol/fwcontrol.c
==============================================================================
--- user/sbruno/1394dev/fwcontrol/fwcontrol.c	Thu Dec  1 18:46:28 2011	(r228185)
+++ user/sbruno/1394dev/fwcontrol/fwcontrol.c	Thu Dec  1 19:57:13 2011	(r228186)
@@ -1063,9 +1063,15 @@ main(int argc, char **argv)
 #define CHANNEL	63
 	if (recv_data != NULL){
 		if (recvfn == NULL) { /* guess... */
-			recvfn = detect_recv_fn(fd, TAG | CHANNEL);
-			close(fd);
-			fd = -1;
+			snprintf(devbase, sizeof(devbase), "%s%d.0", device_string, current_board);
+			if (open_dev(&fd, devbase) < 0) {
+				err(EX_IOERR, "%s: Error opening firewire controller #%d %s in recv_data detect\n",
+					__func__, current_board, devbase);
+			} else {
+				recvfn = detect_recv_fn(fd, TAG | CHANNEL);
+				close(fd);
+				fd = -1;
+			}
 		}
 		snprintf(devbase, sizeof(devbase), "%s%d.0", device_string, current_board);
 		if (open_dev(&fd, devbase) < 0)