svn commit: r215954 - stable/7/sys/dev/asr

[Brian Somers]

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__)