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

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

details:   https://anonhg.NetBSD.org/src/rev/b159d7c754f8
branches:  netbsd-7
changeset: 799527:b159d7c754f8
user:      snj <snj%NetBSD.org@localhost>
date:      Fri Jul 31 17:29:45 2015 +0000

description:
Pull up following revision(s) (requested by christos in ticket #924):
        sys/dev/ccd.c: revision 1.163
initialized sc_unit (from Riastradh)
XXX: pullup-7

diffstat:

 sys/dev/ccd.c |  5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diffs (26 lines):

diff -r ac5dff6c10aa -r b159d7c754f8 sys/dev/ccd.c
--- a/sys/dev/ccd.c     Fri Jul 31 17:26:13 2015 +0000
+++ b/sys/dev/ccd.c     Fri Jul 31 17:29:45 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ccd.c,v 1.151.2.2 2014/11/11 10:42:22 martin Exp $     */
+/*     $NetBSD: ccd.c,v 1.151.2.3 2015/07/31 17:29:45 snj Exp $        */
 
 /*-
  * Copyright (c) 1996, 1997, 1998, 1999, 2007, 2009 The NetBSD Foundation, Inc.
@@ -88,7 +88,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ccd.c,v 1.151.2.2 2014/11/11 10:42:22 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ccd.c,v 1.151.2.3 2015/07/31 17:29:45 snj Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_compat_netbsd.h"
@@ -228,6 +228,7 @@
        }
        /* Initialize per-softc structures. */
        snprintf(sc->sc_xname, sizeof(sc->sc_xname), "ccd%d", unit);
+       sc->sc_unit = unit;
        mutex_init(&sc->sc_dvlock, MUTEX_DEFAULT, IPL_NONE);
        sc->sc_iolock = mutex_obj_alloc(MUTEX_DEFAULT, IPL_NONE);
        cv_init(&sc->sc_stop, "ccdstop");