From 84e6c29ca509bb28a42270aacd9ec2099d35c282 Mon Sep 17 00:00:00 2001 From: Warner Losh Date: Mon, 16 Dec 2019 23:08:09 +0000 Subject: [PATCH] Add back accidentally dropped masking... - PCI_MASK_CONFIG(sc->dev, CBBR_BRIDGECTRL, - & ~CBBM_BRIDGECTRL_INTR_IREQ_ISA_EN, 2); was accidentally dropped from r355822 in the refactor. Restore it since 16-bit cards may fail without it (some bridges autodetect this properly, so my laptop worked when I tested it). Noticed by: rpokala@ --- sys/dev/pccbb/pccbb.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sys/dev/pccbb/pccbb.c b/sys/dev/pccbb/pccbb.c index 4ac0dea784c..041959904f9 100644 --- a/sys/dev/pccbb/pccbb.c +++ b/sys/dev/pccbb/pccbb.c @@ -59,9 +59,6 @@ /* * Driver for PCI to CardBus Bridge chips - * and PCI to PCMCIA Bridge chips - * and ISA to PCMCIA host adapters - * and C Bus to PCMCIA host adapters * * References: * TI Datasheets: @@ -273,6 +270,8 @@ cbb_enable_func_intr(struct cbb_softc *sc) reg = (exca_getb(&sc->exca, EXCA_INTR) & ~EXCA_INTR_IRQ_MASK) | EXCA_INTR_IRQ_NONE; + PCI_MASK_CONFIG(sc->dev, CBBR_BRIDGECTRL, + & ~CBBM_BRIDGECTRL_INTR_IREQ_ISA_EN, 2); exca_putb(&sc->exca, EXCA_INTR, reg); }