Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
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>
+3
-1
drivers/pcmcia/pcmcia_resource.c
+3
-1
drivers/pcmcia/pcmcia_resource.c
···
514
514
}
515
515
516
516
/* Pick memory or I/O card, DMA mode, interrupt */
517
-
if (p_dev->_io)
517
+
if (p_dev->_io || flags & CONF_ENABLE_IRQ)
518
+
flags |= CONF_ENABLE_IOCARD;
519
+
if (flags & CONF_ENABLE_IOCARD)
518
520
s->socket.flags |= SS_IOCARD;
519
521
if (flags & CONF_ENABLE_SPKR) {
520
522
s->socket.flags |= SS_SPKR_ENA;
+2
include/pcmcia/ds.h
+2
include/pcmcia/ds.h
···
259
259
#define CONF_ENABLE_SPKR 0x0002
260
260
#define CONF_ENABLE_PULSE_IRQ 0x0004
261
261
#define CONF_ENABLE_ESR 0x0008
262
+
#define CONF_ENABLE_IOCARD 0x0010 /* auto-enabled if IO resources or IRQ
263
+
* (CONF_ENABLE_IRQ) in use */
262
264
263
265
/* flags used by pcmcia_loop_config() autoconfiguration */
264
266
#define CONF_AUTO_CHECK_VCC 0x0100 /* check for matching Vcc? */