Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 27 Nov 2010 21:18:08 +0000 (UTC)
From:      Brian Somers <brian@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
Subject:   svn commit: r215953 - stable/8/sys/dev/asr
Message-ID:  <201011272118.oARLI8G4000714@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: brian
Date: Sat Nov 27 21:18:08 2010
New Revision: 215953
URL: http://svn.freebsd.org/changeset/base/215953

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

Modified:
  stable/8/sys/dev/asr/asr.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)
  stable/8/sys/mips/alchemy/   (props changed)
  stable/8/sys/mips/atheros/   (props changed)
  stable/8/sys/mips/cavium/   (props changed)
  stable/8/sys/mips/cavium/dev/   (props changed)
  stable/8/sys/mips/rmi/   (props changed)
  stable/8/sys/mips/rmi/dev/   (props changed)
  stable/8/sys/mips/sibyte/   (props changed)

Modified: stable/8/sys/dev/asr/asr.c
==============================================================================
--- stable/8/sys/dev/asr/asr.c	Sat Nov 27 20:38:26 2010	(r215952)
+++ stable/8/sys/dev/asr/asr.c	Sat Nov 27 21:18:08 2010	(r215953)
@@ -3708,9 +3708,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__)



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201011272118.oARLI8G4000714>