diff options
| author | peter <peter@FreeBSD.org> | 1999-04-26 12:49:39 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 1999-04-26 12:49:39 +0000 |
| commit | 0898e23a67c11bb519de5fc41e511e11be686d10 (patch) | |
| tree | 3b7056444047178cde3af00f9ab891e737d4f653 /sys/i386/isa/isa_compat.c | |
| parent | c73393db8c915110c2d213fe4f95579f8df14595 (diff) | |
| download | FreeBSD-src-0898e23a67c11bb519de5fc41e511e11be686d10.zip FreeBSD-src-0898e23a67c11bb519de5fc41e511e11be686d10.tar.gz | |
Only call kvtop on non-null id_maddr's...
Diffstat (limited to 'sys/i386/isa/isa_compat.c')
| -rw-r--r-- | sys/i386/isa/isa_compat.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/sys/i386/isa/isa_compat.c b/sys/i386/isa/isa_compat.c index 8834931..ad5155d 100644 --- a/sys/i386/isa/isa_compat.c +++ b/sys/i386/isa/isa_compat.c @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: isa_compat.c,v 1.4 1999/04/19 18:03:51 peter Exp $ + * $Id: isa_compat.c,v 1.6 1999/04/24 07:04:51 peter Exp $ */ #include <sys/param.h> @@ -179,8 +179,13 @@ isa_compat_probe(device_t dev) isa_set_irq(dev, ffs(dvp->id_irq) - 1); if (dvp->id_drq != isa_get_drq(dev)) isa_set_drq(dev, dvp->id_drq); - if (dvp->id_maddr != maddr) - isa_set_maddr(dev, (int)kvtop(dvp->id_maddr)); + if (dvp->id_maddr != maddr) { + maddr = dvp->id_maddr; + if (maddr != NULL) + isa_set_maddr(dev, kvtop(maddr)); + else + isa_set_maddr(dev, (int)maddr); + } if (dvp->id_msize != isa_get_msize(dev)) isa_set_msize(dev, dvp->id_msize); return 0; |
