From owner-svn-src-all@FreeBSD.ORG  Sat Jun 30 14:05:36 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 5C33910656D1;
	Sat, 30 Jun 2012 14:05:36 +0000 (UTC) (envelope-from avg@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 4564B8FC0C;
	Sat, 30 Jun 2012 14:05:36 +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 q5UE5aPW022914;
	Sat, 30 Jun 2012 14:05:36 GMT (envelope-from avg@svn.freebsd.org)
Received: (from avg@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q5UE5aF7022912;
	Sat, 30 Jun 2012 14:05:36 GMT (envelope-from avg@svn.freebsd.org)
Message-Id: <201206301405.q5UE5aF7022912@svn.freebsd.org>
From: Andriy Gapon <avg@FreeBSD.org>
Date: Sat, 30 Jun 2012 14:05:36 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r237837 - stable/9/usr.sbin/cpucontrol
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: Sat, 30 Jun 2012 14:05:36 -0000

Author: avg
Date: Sat Jun 30 14:05:35 2012
New Revision: 237837
URL: http://svn.freebsd.org/changeset/base/237837

Log:
  MFC r236504: cpucontrol: use CPUCTL_UPDATE ioctl on correct file
  descriptor (in amd case)

Modified:
  stable/9/usr.sbin/cpucontrol/amd.c
Directory Properties:
  stable/9/usr.sbin/cpucontrol/   (props changed)

Modified: stable/9/usr.sbin/cpucontrol/amd.c
==============================================================================
--- stable/9/usr.sbin/cpucontrol/amd.c	Sat Jun 30 13:17:21 2012	(r237836)
+++ stable/9/usr.sbin/cpucontrol/amd.c	Sat Jun 30 14:05:35 2012	(r237837)
@@ -160,7 +160,7 @@ amd_update(const char *dev, const char *
 
 		args.data = fw_image;
 		args.size = st.st_size;
-		error = ioctl(fd, CPUCTL_UPDATE, &args);
+		error = ioctl(devfd, CPUCTL_UPDATE, &args);
 		if (error < 0) {
 			fprintf(stderr, "failed.\n");
 			warn("ioctl()");