Module Name: src
Committed By: martin
Date: Thu Nov 14 15:38:03 UTC 2019
Modified Files:
src/sys/arch/amiga/dev [netbsd-9]: if_qn.c zssc.c
src/sys/arch/mac68k/obio [netbsd-9]: iwm_fd.c
src/sys/arch/mvme68k/dev [netbsd-9]: wdsc.c
src/sys/arch/next68k/dev [netbsd-9]: nextdisplay.c
src/sys/dev/gpib [netbsd-9]: ct.c mt.c ppi.c
src/sys/dev/isa [netbsd-9]: if_iy.c mcd.c tcic2_isa.c uha_isa.c
src/sys/dev/pci [netbsd-9]: if_stge.c neo.c
src/sys/dev/pcmcia [netbsd-9]: if_tr_pcmcia.c
src/sys/dev/sbus [netbsd-9]: sio16.c
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #425):
sys/dev/sbus/sio16.c: revision 1.25
sys/dev/gpib/mt.c: revision 1.33
sys/arch/mvme68k/dev/wdsc.c: revision 1.33
sys/dev/gpib/ct.c: revision 1.31
sys/dev/isa/mcd.c: revision 1.119
sys/dev/pci/if_stge.c: revision 1.73
sys/dev/gpib/ppi.c: revision 1.25
sys/dev/pcmcia/if_tr_pcmcia.c: revision 1.29
sys/arch/amiga/dev/zssc.c: revision 1.46
sys/arch/mac68k/obio/iwm_fd.c: revision 1.57
sys/arch/amiga/dev/if_qn.c: revision 1.48
sys/dev/isa/tcic2_isa.c: revision 1.28
sys/dev/isa/uha_isa.c: revision 1.42
sys/dev/pci/neo.c: revision 1.55
sys/arch/next68k/dev/nextdisplay.c: revision 1.22
sys/dev/isa/if_iy.c: revision 1.111
Add missing initialization of sc_dev.
Initialize sc_dev correctly to avoid null pointer dereference when
bus_space_map() failed.
Add missing initialization of sc_dev.
To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.47.4.1 src/sys/arch/amiga/dev/if_qn.c
cvs rdiff -u -r1.45 -r1.45.42.1 src/sys/arch/amiga/dev/zssc.c
cvs rdiff -u -r1.56 -r1.56.22.1 src/sys/arch/mac68k/obio/iwm_fd.c
cvs rdiff -u -r1.32 -r1.32.42.1 src/sys/arch/mvme68k/dev/wdsc.c
cvs rdiff -u -r1.21 -r1.21.42.1 src/sys/arch/next68k/dev/nextdisplay.c
cvs rdiff -u -r1.30 -r1.30.4.1 src/sys/dev/gpib/ct.c
cvs rdiff -u -r1.32 -r1.32.4.1 src/sys/dev/gpib/mt.c
cvs rdiff -u -r1.24 -r1.24.4.1 src/sys/dev/gpib/ppi.c
cvs rdiff -u -r1.109 -r1.109.2.1 src/sys/dev/isa/if_iy.c
cvs rdiff -u -r1.118 -r1.118.4.1 src/sys/dev/isa/mcd.c
cvs rdiff -u -r1.27 -r1.27.24.1 src/sys/dev/isa/tcic2_isa.c
cvs rdiff -u -r1.41 -r1.41.26.1 src/sys/dev/isa/uha_isa.c
cvs rdiff -u -r1.70.2.1 -r1.70.2.2 src/sys/dev/pci/if_stge.c
cvs rdiff -u -r1.54 -r1.54.2.1 src/sys/dev/pci/neo.c
cvs rdiff -u -r1.28 -r1.28.4.1 src/sys/dev/pcmcia/if_tr_pcmcia.c
cvs rdiff -u -r1.24 -r1.24.60.1 src/sys/dev/sbus/sio16.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amiga/dev/if_qn.c
diff -u src/sys/arch/amiga/dev/if_qn.c:1.47 src/sys/arch/amiga/dev/if_qn.c:1.47.4.1
--- src/sys/arch/amiga/dev/if_qn.c:1.47 Tue Feb 5 06:17:00 2019
+++ src/sys/arch/amiga/dev/if_qn.c Thu Nov 14 15:38:02 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_qn.c,v 1.47 2019/02/05 06:17:00 msaitoh Exp $ */
+/* $NetBSD: if_qn.c,v 1.47.4.1 2019/11/14 15:38:02 martin Exp $ */
/*
* Copyright (c) 1995 Mika Kortelainen
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_qn.c,v 1.47 2019/02/05 06:17:00 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_qn.c,v 1.47.4.1 2019/11/14 15:38:02 martin Exp $");
#include "qn.h"
#if NQN > 0
@@ -195,6 +195,7 @@ qnattach(device_t parent, device_t self,
struct ifnet *ifp = &sc->sc_ethercom.ec_if;
u_int8_t myaddr[ETHER_ADDR_LEN];
+ sc->sc_dev = self;
zap = (struct zbus_args *)aux;
sc->sc_base = zap->va;
Index: src/sys/arch/amiga/dev/zssc.c
diff -u src/sys/arch/amiga/dev/zssc.c:1.45 src/sys/arch/amiga/dev/zssc.c:1.45.42.1
--- src/sys/arch/amiga/dev/zssc.c:1.45 Sat Oct 27 17:17:32 2012
+++ src/sys/arch/amiga/dev/zssc.c Thu Nov 14 15:38:02 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: zssc.c,v 1.45 2012/10/27 17:17:32 chs Exp $ */
+/* $NetBSD: zssc.c,v 1.45.42.1 2019/11/14 15:38:02 martin Exp $ */
/*
* Copyright (c) 1982, 1990 The Regents of the University of California.
@@ -58,7 +58,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: zssc.c,v 1.45 2012/10/27 17:17:32 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zssc.c,v 1.45.42.1 2019/11/14 15:38:02 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -103,15 +103,15 @@ zsscmatch(device_t parent, cfdata_t cf,
void
zsscattach(device_t parent, device_t self, void *aux)
{
- struct siop_softc *sc;
+ struct siop_softc *sc = device_private(self);
struct zbus_args *zap;
siop_regmap_p rp;
printf("\n");
+ sc->sc_dev = self;
zap = aux;
- sc = device_private(self);
sc->sc_siopp = rp = (siop_regmap_p)((char *)zap->va + 0x4000);
/*
Index: src/sys/arch/mac68k/obio/iwm_fd.c
diff -u src/sys/arch/mac68k/obio/iwm_fd.c:1.56 src/sys/arch/mac68k/obio/iwm_fd.c:1.56.22.1
--- src/sys/arch/mac68k/obio/iwm_fd.c:1.56 Sun Apr 26 15:15:19 2015
+++ src/sys/arch/mac68k/obio/iwm_fd.c Thu Nov 14 15:38:02 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: iwm_fd.c,v 1.56 2015/04/26 15:15:19 mlelstv Exp $ */
+/* $NetBSD: iwm_fd.c,v 1.56.22.1 2019/11/14 15:38:02 martin Exp $ */
/*
* Copyright (c) 1997, 1998 Hauke Fath. All rights reserved.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iwm_fd.c,v 1.56 2015/04/26 15:15:19 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iwm_fd.c,v 1.56.22.1 2019/11/14 15:38:02 martin Exp $");
#include "locators.h"
@@ -441,6 +441,7 @@ fd_attach(device_t parent, device_t self
iwm = device_private(parent);
fd = device_private(self);
+ fd->sc_dev = self;
ia = aux;
driveInfo = iwmCheckDrive(ia->unit);
Index: src/sys/arch/mvme68k/dev/wdsc.c
diff -u src/sys/arch/mvme68k/dev/wdsc.c:1.32 src/sys/arch/mvme68k/dev/wdsc.c:1.32.42.1
--- src/sys/arch/mvme68k/dev/wdsc.c:1.32 Sat Oct 27 17:18:04 2012
+++ src/sys/arch/mvme68k/dev/wdsc.c Thu Nov 14 15:38:02 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: wdsc.c,v 1.32 2012/10/27 17:18:04 chs Exp $ */
+/* $NetBSD: wdsc.c,v 1.32.42.1 2019/11/14 15:38:02 martin Exp $ */
/*
* Copyright (c) 1982, 1990 The Regents of the University of California.
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wdsc.c,v 1.32 2012/10/27 17:18:04 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wdsc.c,v 1.32.42.1 2019/11/14 15:38:02 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -125,6 +125,7 @@ wdsc_pcc_attach(device_t parent, device_
static struct evcnt evcnt; /* XXXSCW: Temporary hack */
sc = device_private(self);
+ sc->sc_dev = self;
pa = aux;
bus_space_map(pa->pa_bust, pa->pa_offset, 0x20, 0, &bush);
Index: src/sys/arch/next68k/dev/nextdisplay.c
diff -u src/sys/arch/next68k/dev/nextdisplay.c:1.21 src/sys/arch/next68k/dev/nextdisplay.c:1.21.42.1
--- src/sys/arch/next68k/dev/nextdisplay.c:1.21 Sat Oct 27 17:18:05 2012
+++ src/sys/arch/next68k/dev/nextdisplay.c Thu Nov 14 15:38:03 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: nextdisplay.c,v 1.21 2012/10/27 17:18:05 chs Exp $ */
+/* $NetBSD: nextdisplay.c,v 1.21.42.1 2019/11/14 15:38:03 martin Exp $ */
/*
* Copyright (c) 1998 Matt DeBergalis
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nextdisplay.c,v 1.21 2012/10/27 17:18:05 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nextdisplay.c,v 1.21.42.1 2019/11/14 15:38:03 martin Exp $");
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
@@ -234,6 +234,8 @@ nextdisplay_attach(device_t parent, devi
int iscolor;
paddr_t addr;
+ sc->sc_dev = self;
+
if (rom_machine_type == NeXT_WARP9C ||
rom_machine_type == NeXT_TURBO_COLOR) {
iscolor = 1;
Index: src/sys/dev/gpib/ct.c
diff -u src/sys/dev/gpib/ct.c:1.30 src/sys/dev/gpib/ct.c:1.30.4.1
--- src/sys/dev/gpib/ct.c:1.30 Sat Feb 23 11:33:31 2019
+++ src/sys/dev/gpib/ct.c Thu Nov 14 15:38:02 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ct.c,v 1.30 2019/02/23 11:33:31 kamil Exp $ */
+/* $NetBSD: ct.c,v 1.30.4.1 2019/11/14 15:38:02 martin Exp $ */
/*-
* Copyright (c) 1996-2003 The NetBSD Foundation, Inc.
@@ -82,7 +82,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ct.c,v 1.30 2019/02/23 11:33:31 kamil Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ct.c,v 1.30.4.1 2019/11/14 15:38:02 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -260,6 +260,7 @@ ctattach(device_t parent, device_t self,
char name[7];
int type, i, n, canstream = 0;
+ sc->sc_dev = self;
sc->sc_ic = ca->ca_ic;
sc->sc_slave = ca->ca_slave;
sc->sc_punit = ca->ca_punit;
Index: src/sys/dev/gpib/mt.c
diff -u src/sys/dev/gpib/mt.c:1.32 src/sys/dev/gpib/mt.c:1.32.4.1
--- src/sys/dev/gpib/mt.c:1.32 Sun Feb 24 20:54:13 2019
+++ src/sys/dev/gpib/mt.c Thu Nov 14 15:38:02 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: mt.c,v 1.32 2019/02/24 20:54:13 kamil Exp $ */
+/* $NetBSD: mt.c,v 1.32.4.1 2019/11/14 15:38:02 martin Exp $ */
/*-
* Copyright (c) 1996-2003 The NetBSD Foundation, Inc.
@@ -75,7 +75,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mt.c,v 1.32 2019/02/24 20:54:13 kamil Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mt.c,v 1.32.4.1 2019/11/14 15:38:02 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -230,6 +230,7 @@ mtattach(device_t parent, device_t self,
struct cs80bus_attach_args *ca = aux;
int type;
+ sc->sc_dev = self;
sc->sc_ic = ca->ca_ic;
sc->sc_slave = ca->ca_slave;
Index: src/sys/dev/gpib/ppi.c
diff -u src/sys/dev/gpib/ppi.c:1.24 src/sys/dev/gpib/ppi.c:1.24.4.1
--- src/sys/dev/gpib/ppi.c:1.24 Mon Sep 3 16:29:30 2018
+++ src/sys/dev/gpib/ppi.c Thu Nov 14 15:38:02 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ppi.c,v 1.24 2018/09/03 16:29:30 riastradh Exp $ */
+/* $NetBSD: ppi.c,v 1.24.4.1 2019/11/14 15:38:02 martin Exp $ */
/*-
* Copyright (c) 1996-2003 The NetBSD Foundation, Inc.
@@ -65,7 +65,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ppi.c,v 1.24 2018/09/03 16:29:30 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ppi.c,v 1.24.4.1 2019/11/14 15:38:02 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -167,6 +167,7 @@ ppiattach(device_t parent, device_t self
printf("\n");
+ sc->sc_dev = self;
sc->sc_ic = ga->ga_ic;
sc->sc_address = ga->ga_address;
Index: src/sys/dev/isa/if_iy.c
diff -u src/sys/dev/isa/if_iy.c:1.109 src/sys/dev/isa/if_iy.c:1.109.2.1
--- src/sys/dev/isa/if_iy.c:1.109 Wed May 29 10:07:29 2019
+++ src/sys/dev/isa/if_iy.c Thu Nov 14 15:38:02 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_iy.c,v 1.109 2019/05/29 10:07:29 msaitoh Exp $ */
+/* $NetBSD: if_iy.c,v 1.109.2.1 2019/11/14 15:38:02 martin Exp $ */
/* #define IYDEBUG */
/* #define IYMEMDEBUG */
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_iy.c,v 1.109 2019/05/29 10:07:29 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_iy.c,v 1.109.2.1 2019/11/14 15:38:02 martin Exp $");
#include "opt_inet.h"
@@ -282,6 +282,7 @@ iyattach(device_t parent, device_t self,
uint8_t myaddr[ETHER_ADDR_LEN];
int eirq;
+ sc->sc_dev = self;
iot = ia->ia_iot;
if (bus_space_map(iot, ia->ia_io[0].ir_addr, 16, 0, &ioh)) {
Index: src/sys/dev/isa/mcd.c
diff -u src/sys/dev/isa/mcd.c:1.118 src/sys/dev/isa/mcd.c:1.118.4.1
--- src/sys/dev/isa/mcd.c:1.118 Sun Feb 24 20:50:03 2019
+++ src/sys/dev/isa/mcd.c Thu Nov 14 15:38:02 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: mcd.c,v 1.118 2019/02/24 20:50:03 kamil Exp $ */
+/* $NetBSD: mcd.c,v 1.118.4.1 2019/11/14 15:38:02 martin Exp $ */
/*
* Copyright (c) 1993, 1994, 1995 Charles M. Hannum. All rights reserved.
@@ -56,7 +56,7 @@
/*static char COPYRIGHT[] = "mcd-driver (C)1993 by H.Veit & B.Moore";*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mcd.c,v 1.118 2019/02/24 20:50:03 kamil Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mcd.c,v 1.118.4.1 2019/11/14 15:38:02 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -262,6 +262,7 @@ mcdattach(device_t parent, device_t self
bus_space_handle_t ioh;
struct mcd_mbox mbx;
+ sc->sc_dev = self;
aprint_naive("\n");
/* Map i/o space */
Index: src/sys/dev/isa/tcic2_isa.c
diff -u src/sys/dev/isa/tcic2_isa.c:1.27 src/sys/dev/isa/tcic2_isa.c:1.27.24.1
--- src/sys/dev/isa/tcic2_isa.c:1.27 Thu Jul 14 10:19:06 2016
+++ src/sys/dev/isa/tcic2_isa.c Thu Nov 14 15:38:02 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: tcic2_isa.c,v 1.27 2016/07/14 10:19:06 msaitoh Exp $ */
+/* $NetBSD: tcic2_isa.c,v 1.27.24.1 2019/11/14 15:38:02 martin Exp $ */
/*
*
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tcic2_isa.c,v 1.27 2016/07/14 10:19:06 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcic2_isa.c,v 1.27.24.1 2019/11/14 15:38:02 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -224,6 +224,7 @@ tcic_isa_attach(device_t parent, device_
bus_space_handle_t ioh;
bus_space_handle_t memh;
+ sc->sc_dev = self;
aprint_naive("\n");
/* Map i/o space. */
Index: src/sys/dev/isa/uha_isa.c
diff -u src/sys/dev/isa/uha_isa.c:1.41 src/sys/dev/isa/uha_isa.c:1.41.26.1
--- src/sys/dev/isa/uha_isa.c:1.41 Sat Oct 18 08:33:28 2014
+++ src/sys/dev/isa/uha_isa.c Thu Nov 14 15:38:02 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: uha_isa.c,v 1.41 2014/10/18 08:33:28 snj Exp $ */
+/* $NetBSD: uha_isa.c,v 1.41.26.1 2019/11/14 15:38:02 martin Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uha_isa.c,v 1.41 2014/10/18 08:33:28 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uha_isa.c,v 1.41.26.1 2019/11/14 15:38:02 martin Exp $");
#include "opt_ddb.h"
@@ -143,6 +143,7 @@ uha_isa_attach(device_t parent, device_t
isa_chipset_tag_t ic = ia->ia_ic;
int error;
+ sc->sc_dev = self;
printf("\n");
if (bus_space_map(iot, ia->ia_io[0].ir_addr, UHA_ISA_IOSIZE, 0, &ioh)) {
@@ -150,7 +151,6 @@ uha_isa_attach(device_t parent, device_t
return;
}
- sc->sc_dev = self;
sc->sc_iot = iot;
sc->sc_ioh = ioh;
sc->sc_dmat = dmat;
Index: src/sys/dev/pci/if_stge.c
diff -u src/sys/dev/pci/if_stge.c:1.70.2.1 src/sys/dev/pci/if_stge.c:1.70.2.2
--- src/sys/dev/pci/if_stge.c:1.70.2.1 Wed Nov 6 09:59:39 2019
+++ src/sys/dev/pci/if_stge.c Thu Nov 14 15:38:02 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_stge.c,v 1.70.2.1 2019/11/06 09:59:39 martin Exp $ */
+/* $NetBSD: if_stge.c,v 1.70.2.2 2019/11/14 15:38:02 martin Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_stge.c,v 1.70.2.1 2019/11/06 09:59:39 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_stge.c,v 1.70.2.2 2019/11/14 15:38:02 martin Exp $");
#include <sys/param.h>
@@ -389,6 +389,7 @@ stge_attach(device_t parent, device_t se
uint8_t enaddr[ETHER_ADDR_LEN];
char intrbuf[PCI_INTRSTR_LEN];
+ sc->sc_dev = self;
callout_init(&sc->sc_tick_ch, 0);
sp = stge_lookup(pa);
Index: src/sys/dev/pci/neo.c
diff -u src/sys/dev/pci/neo.c:1.54 src/sys/dev/pci/neo.c:1.54.2.1
--- src/sys/dev/pci/neo.c:1.54 Sat Jun 8 08:02:38 2019
+++ src/sys/dev/pci/neo.c Thu Nov 14 15:38:02 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: neo.c,v 1.54 2019/06/08 08:02:38 isaki Exp $ */
+/* $NetBSD: neo.c,v 1.54.2.1 2019/11/14 15:38:02 martin Exp $ */
/*
* Copyright (c) 1999 Cameron Grant <gand...@vilnya.demon.co.uk>
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: neo.c,v 1.54 2019/06/08 08:02:38 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: neo.c,v 1.54.2.1 2019/11/14 15:38:02 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -559,6 +559,7 @@ neo_attach(device_t parent, device_t sel
char intrbuf[PCI_INTRSTR_LEN];
sc = device_private(self);
+ sc->dev = self;
pa = aux;
pc = pa->pa_pc;
Index: src/sys/dev/pcmcia/if_tr_pcmcia.c
diff -u src/sys/dev/pcmcia/if_tr_pcmcia.c:1.28 src/sys/dev/pcmcia/if_tr_pcmcia.c:1.28.4.1
--- src/sys/dev/pcmcia/if_tr_pcmcia.c:1.28 Tue Jan 8 08:47:21 2019
+++ src/sys/dev/pcmcia/if_tr_pcmcia.c Thu Nov 14 15:38:02 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_tr_pcmcia.c,v 1.28 2019/01/08 08:47:21 msaitoh Exp $ */
+/* $NetBSD: if_tr_pcmcia.c,v 1.28.4.1 2019/11/14 15:38:02 martin Exp $ */
/*
* Copyright (c) 2000 Soren S. Jorvang. All rights reserved.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_tr_pcmcia.c,v 1.28 2019/01/08 08:47:21 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_tr_pcmcia.c,v 1.28.4.1 2019/11/14 15:38:02 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -124,6 +124,7 @@ tr_pcmcia_attach(device_t parent, device
bus_size_t offset;
psc->sc_pf = pa->pf;
+ sc->sc_dev = self;
cfe = SIMPLEQ_FIRST(&pa->pf->cfe_head);
Index: src/sys/dev/sbus/sio16.c
diff -u src/sys/dev/sbus/sio16.c:1.24 src/sys/dev/sbus/sio16.c:1.24.60.1
--- src/sys/dev/sbus/sio16.c:1.24 Mon Jul 18 00:58:52 2011
+++ src/sys/dev/sbus/sio16.c Thu Nov 14 15:38:02 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: sio16.c,v 1.24 2011/07/18 00:58:52 mrg Exp $ */
+/* $NetBSD: sio16.c,v 1.24.60.1 2019/11/14 15:38:02 martin Exp $ */
/*
* Copyright (c) 1998, 2001 Matthew R. Green
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sio16.c,v 1.24 2011/07/18 00:58:52 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sio16.c,v 1.24.60.1 2019/11/14 15:38:02 martin Exp $");
#include <sys/param.h>
#include <sys/conf.h>
@@ -286,6 +286,7 @@ clcd_attach(device_t parent, device_t se
struct cd18xx_softc *sc = device_private(self);
struct sio16_attach_args *args = aux;
+ sc->sc_dev = self;
sc->sc_tag = args->cd_tag;
sc->sc_handle = args->cd_handle;
sc->sc_osc = args->cd_osc;
