d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

The ed_probe_Novell should not clear id_maddr when it fails to probe.

Browse Source 
This fixes potential panic by kvtop at addr == 0.

Submitted by:	chi@bd.mbn.or.jp (Chiharu Shibata)
This commit is contained in:
kato 1999-09-02 15:01:56 +00:00
parent dd6a139d59
commit 99f66b6bc1
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/dev/ed/if_ed.c
View File

@ -1282,10 +1282,14 @@ ed_probe_Novell(isa_dev)
struct isa_device *isa_dev;
{
struct ed_softc *sc = &ed_softc[isa_dev->id_unit];
int nports;
isa_dev->id_maddr = 0;
return ed_probe_Novell_generic(sc, isa_dev->id_iobase,
nports = ed_probe_Novell_generic(sc, isa_dev->id_iobase,
isa_dev->id_unit, isa_dev->id_flags);
if (nports)
isa_dev->id_maddr = 0;
return (nports);
}
#if NCARD > 0

8
sys/i386/isa/if_ed.c
View File

@ -1282,10 +1282,14 @@ ed_probe_Novell(isa_dev)
struct isa_device *isa_dev;
{
struct ed_softc *sc = &ed_softc[isa_dev->id_unit];
int nports;
isa_dev->id_maddr = 0;
return ed_probe_Novell_generic(sc, isa_dev->id_iobase,
nports = ed_probe_Novell_generic(sc, isa_dev->id_iobase,
isa_dev->id_unit, isa_dev->id_flags);
if (nports)
isa_dev->id_maddr = 0;
return (nports);
}
#if NCARD > 0