From owner-svn-src-stable-7@FreeBSD.ORG  Sat Nov 27 21:20:51 2010
Return-Path: <owner-svn-src-stable-7@FreeBSD.ORG>
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 9E193106566C;
	Sat, 27 Nov 2010 21:20:51 +0000 (UTC)
	(envelope-from brian@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 8C5D28FC0C;
	Sat, 27 Nov 2010 21:20:51 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id oARLKpE1001025;
	Sat, 27 Nov 2010 21:20:51 GMT (envelope-from brian@svn.freebsd.org)
Received: (from brian@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id oARLKpfX001022;
	Sat, 27 Nov 2010 21:20:51 GMT (envelope-from brian@svn.freebsd.org)
Message-Id: <201011272120.oARLKpfX001022@svn.freebsd.org>
From: Brian Somers <brian@FreeBSD.org>
Date: Sat, 27 Nov 2010 21:20:51 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r215954 - stable/7/sys/dev/asr
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	<svn-src-stable-7.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-7>
List-Post: <mailto:svn-src-stable-7@freebsd.org>
List-Help: <mailto:svn-src-stable-7-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 27 Nov 2010 21:20:51 -0000

Author: brian
Date: Sat Nov 27 21:20:51 2010
New Revision: 215954
URL: http://svn.freebsd.org/changeset/base/215954

Log:
  MFC r21584: Don't zero 'Info' after setting it up in the ASR_IOCTL_COMPAT case.

Modified:
  stable/7/sys/dev/asr/asr.c
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/dev/asr/asr.c
==============================================================================
--- stable/7/sys/dev/asr/asr.c	Sat Nov 27 21:18:08 2010	(r215953)
+++ stable/7/sys/dev/asr/asr.c	Sat Nov 27 21:20:51 2010	(r215954)
@@ -3711,9 +3711,9 @@ asr_ioctl(struct cdev *dev, u_long cmd, 
 		Info.drive1CMOS = j;
 
 		Info.numDrives = *((char *)ptok(0x475));
-#endif /* ASR_IOCTL_COMPAT */
-
+#else /* ASR_IOCTL_COMPAT */
 		bzero(&Info, sizeof(Info));
+#endif /* ASR_IOCTL_COMPAT */
 
 		Info.processorFamily = ASR_sig.dsProcessorFamily;
 #if defined(__i386__)