Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 33619f0d authored by Dominik Brodowski's avatar Dominik Brodowski
Browse files

pcmcia: re-enable Zoomed Video support 



Allow drivers to enable Zoomed Video support. Currently, this is only
used by out-of-tree drivers (L64020 DVB driver in particular).

CC: <stable@kernel.org> [for 2.6.37]
Signed-off-by: default avatarDominik Brodowski <linux@dominikbrodowski.net>
parent 644e6e4a

drivers/pcmcia/pcmcia_resource.c

+2 −0
Original line number Diff line number Diff line
@@ -518,6 +518,8 @@ int pcmcia_enable_device(struct pcmcia_device *p_dev) 
		flags |= CONF_ENABLE_IOCARD;

	if (flags & CONF_ENABLE_IOCARD)

		s->socket.flags |= SS_IOCARD;

	if (flags & CONF_ENABLE_ZVCARD)

		s->socket.flags |= SS_ZVCARD | SS_IOCARD;

	if (flags & CONF_ENABLE_SPKR) {

		s->socket.flags |= SS_SPKR_ENA;

		status = CCSR_AUDIO_ENA;

include/pcmcia/ds.h

+1 −0
Original line number Diff line number Diff line
@@ -261,6 +261,7 @@ void pcmcia_disable_device(struct pcmcia_device *p_dev); 
#define CONF_ENABLE_ESR         0x0008

#define CONF_ENABLE_IOCARD	0x0010 /* auto-enabled if IO resources or IRQ

					* (CONF_ENABLE_IRQ) in use */

#define CONF_ENABLE_ZVCARD	0x0020



/* flags used by pcmcia_loop_config() autoconfiguration */

#define CONF_AUTO_CHECK_VCC	0x0100 /* check for matching Vcc? */