[src/netbsd-6]: src/sys/dev/mscp Pull up following revision(s) (requested by ...

[riz <riz%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/a84548b91487
branches:  netbsd-6
changeset: 774326:a84548b91487
user:      riz <riz%NetBSD.org@localhost>
date:      Thu Jul 12 18:32:05 2012 +0000

description:
Pull up following revision(s) (requested by abs in ticket #412):
        sys/dev/mscp/mscp_disk.c: revision 1.75
- Unconditionally initialise tp to avoid a warning
- Use DK_CLOSED rather than CLOSED (no functional change)

diffstat:

 sys/dev/mscp/mscp_disk.c |  10 ++++------
 1 files changed, 4 insertions(+), 6 deletions(-)

diffs (46 lines):

diff -r 8c233e33aeac -r a84548b91487 sys/dev/mscp/mscp_disk.c
--- a/sys/dev/mscp/mscp_disk.c  Thu Jul 12 18:29:57 2012 +0000
+++ b/sys/dev/mscp/mscp_disk.c  Thu Jul 12 18:32:05 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mscp_disk.c,v 1.71.18.1 2012/07/04 20:41:46 jdc Exp $  */
+/*     $NetBSD: mscp_disk.c,v 1.71.18.2 2012/07/12 18:32:05 riz Exp $  */
 /*
  * Copyright (c) 1988 Regents of the University of California.
  * All rights reserved.
@@ -82,7 +82,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mscp_disk.c,v 1.71.18.1 2012/07/04 20:41:46 jdc Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mscp_disk.c,v 1.71.18.2 2012/07/12 18:32:05 riz Exp $");
 
 #include <sys/param.h>
 #include <sys/buf.h>
@@ -305,7 +305,7 @@
                        (void) tsleep(&udautab[unit], PZERO - 1,
                            "raclose", 0);
                splx(s);
-               ra->ra_state = CLOSED;
+               ra->ra_state = DK_CLOSED;
                ra->ra_wlabel = 0;
        }
 #endif
@@ -461,9 +461,8 @@
                if (cmd == ODIOCGDEFLABEL)
                        tp = &newlabel;
                else
-#else
+#endif
                tp = (struct disklabel *)data;
-#endif
                memset(tp, 0, sizeof(struct disklabel));
                tp->d_secsize = lp->d_secsize;
                tp->d_nsectors = lp->d_nsectors;
@@ -523,7 +522,6 @@
        return (error);
 }
 
-
 int
 radump(dev_t dev, daddr_t blkno, void *va, size_t size)
 {