diff options
| author | Dominik Brodowski <linux@dominikbrodowski.net> | 2010-10-22 08:46:36 +0200 |
|---|---|---|
| committer | Dominik Brodowski <linux@dominikbrodowski.net> | 2010-10-22 08:46:36 +0200 |
| commit | ff10fca5ceacf7bc59636f5ab808e775d1717167 (patch) | |
| tree | a76795dbaaf7099c3accac1acc884e9e55aeea2e | |
| parent | Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/pow... (diff) | |
| download | linux-ff10fca5ceacf7bc59636f5ab808e775d1717167.tar.xz linux-ff10fca5ceacf7bc59636f5ab808e775d1717167.zip | |
pcmcia: IOCARD is also required for using IRQs
Dave Hinds pointed out to me that 37979e1546a7 will break b43 and
ray_cs, as IOCARD is not -- as the name would suggest -- only needed
for cards using IO ports. Instead, as it re-deines several pins, it
is also required for using interrupts.
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
| -rw-r--r-- | drivers/pcmcia/pcmcia_resource.c | 4 | ||||
| -rw-r--r-- | include/pcmcia/ds.h | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/drivers/pcmcia/pcmcia_resource.c b/drivers/pcmcia/pcmcia_resource.c index a9af0d784426..0bdda5b3ed55 100644 --- a/drivers/pcmcia/pcmcia_resource.c +++ b/drivers/pcmcia/pcmcia_resource.c @@ -514,7 +514,9 @@ int pcmcia_enable_device(struct pcmcia_device *p_dev) } /* Pick memory or I/O card, DMA mode, interrupt */ - if (p_dev->_io) + if (p_dev->_io || flags & CONF_ENABLE_IRQ) + flags |= CONF_ENABLE_IOCARD; + if (flags & CONF_ENABLE_IOCARD) s->socket.flags |= SS_IOCARD; if (flags & CONF_ENABLE_SPKR) { s->socket.flags |= SS_SPKR_ENA; diff --git a/include/pcmcia/ds.h b/include/pcmcia/ds.h index d830c87ff0a7..8479b66c067b 100644 --- a/include/pcmcia/ds.h +++ b/include/pcmcia/ds.h @@ -259,6 +259,8 @@ void pcmcia_disable_device(struct pcmcia_device *p_dev); #define CONF_ENABLE_SPKR 0x0002 #define CONF_ENABLE_PULSE_IRQ 0x0004 #define CONF_ENABLE_ESR 0x0008 +#define CONF_ENABLE_IOCARD 0x0010 /* auto-enabled if IO resources or IRQ + * (CONF_ENABLE_IRQ) in use */ /* flags used by pcmcia_loop_config() autoconfiguration */ #define CONF_AUTO_CHECK_VCC 0x0100 /* check for matching Vcc? */ |