Commit fe0d128c authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: jack: Allow building the jack layer without input device 



Since the recent integration of kctl jack and input jack layers, we
can basically build the jack layer even without input devices.  That
is, the jack layer itself can be built with conditional to enable the
input device support or not, while the users may enable always
CONFIG_SND_JACK unconditionally.

For achieving it, this patch changes the following:
- A new Kconfig, CONFIG_SND_JACK_INPUT_DEV, was introduced to indicate
  whether the jack layer supports the input device,
- A few items in snd_jack struct and relevant codes are conditionally
  built upon CONFIG_SND_JACK_INPUT_DEV,
- The users of CONFIG_SND_JACK drop the messy dependency on
  CONFIG_INPUT.

This change also automagically fixes a potential bug in HD-audio
driver Arnd reported, where the NULL or uninitialized jack instance is
dereferenced.

Reported-by: default avatarArnd Bergmann <arnd@arndb.de>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 94a57350

include/sound/jack.h

+14 −9
Original line number Diff line number Diff line
@@ -72,14 +72,16 @@ enum snd_jack_types { 
#define SND_JACK_SWITCH_TYPES 6



struct snd_jack {

	struct input_dev *input_dev;

	struct list_head kctl_list;

	struct snd_card *card;

	const char *id;

#ifdef CONFIG_SND_JACK_INPUT_DEV

	struct input_dev *input_dev;

	int registered;

	int type;

	const char *id;

	char name[100];

	unsigned int key[6];   /* Keep in sync with definitions above */

#endif /* CONFIG_SND_JACK_INPUT_DEV */

	void *private_data;

	void (*private_free)(struct snd_jack *);

};
@@ -89,10 +91,11 @@ struct snd_jack { 
int snd_jack_new(struct snd_card *card, const char *id, int type,

		 struct snd_jack **jack, bool initial_kctl, bool phantom_jack);

int snd_jack_add_new_kctl(struct snd_jack *jack, const char * name, int mask);

#ifdef CONFIG_SND_JACK_INPUT_DEV

void snd_jack_set_parent(struct snd_jack *jack, struct device *parent);

int snd_jack_set_key(struct snd_jack *jack, enum snd_jack_types type,

		     int keytype);



#endif

void snd_jack_report(struct snd_jack *jack, int status);



#else
@@ -107,6 +110,13 @@ static inline int snd_jack_add_new_kctl(struct snd_jack *jack, const char * name 
	return 0;

}



static inline void snd_jack_report(struct snd_jack *jack, int status)

{

}



#endif



#if !defined(CONFIG_SND_JACK) || !defined(CONFIG_SND_JACK_INPUT_DEV)

static inline void snd_jack_set_parent(struct snd_jack *jack,

				       struct device *parent)

{
@@ -118,11 +128,6 @@ static inline int snd_jack_set_key(struct snd_jack *jack, 
{

	return 0;

}



static inline void snd_jack_report(struct snd_jack *jack, int status)

{

}



#endif

#endif /* !CONFIG_SND_JACK || !CONFIG_SND_JACK_INPUT_DEV */



#endif

sound/core/Kconfig

+6 −3
Original line number Diff line number Diff line
@@ -24,12 +24,15 @@ config SND_RAWMIDI 
config SND_COMPRESS_OFFLOAD

	tristate



# To be effective this also requires INPUT - users should say:

#    select SND_JACK if INPUT=y || INPUT=SND

# to avoid having to force INPUT on.

config SND_JACK

	bool



# enable input device support in jack layer

config SND_JACK_INPUT_DEV

	bool

	depends on SND_JACK

	default y if INPUT=y || INPUT=SND



config SND_SEQUENCER

	tristate "Sequencer support"

	select SND_TIMER

sound/core/jack.c

+20 −3
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ struct snd_jack_kctl { 
	unsigned int mask_bits; /* only masked status bits are reported via kctl */

};



#ifdef CONFIG_SND_JACK_INPUT_DEV

static int jack_switch_types[SND_JACK_SWITCH_TYPES] = {

	SW_HEADPHONE_INSERT,

	SW_MICROPHONE_INSERT,
@@ -40,9 +41,11 @@ static int jack_switch_types[SND_JACK_SWITCH_TYPES] = { 
	SW_VIDEOOUT_INSERT,

	SW_LINEIN_INSERT,

};

#endif /* CONFIG_SND_JACK_INPUT_DEV */



static int snd_jack_dev_disconnect(struct snd_device *device)

{

#ifdef CONFIG_SND_JACK_INPUT_DEV

	struct snd_jack *jack = device->device_data;



	if (!jack->input_dev)
@@ -55,6 +58,7 @@ static int snd_jack_dev_disconnect(struct snd_device *device) 
	else

		input_free_device(jack->input_dev);

	jack->input_dev = NULL;

#endif /* CONFIG_SND_JACK_INPUT_DEV */

	return 0;

}
@@ -79,6 +83,7 @@ static int snd_jack_dev_free(struct snd_device *device) 
	return 0;

}



#ifdef CONFIG_SND_JACK_INPUT_DEV

static int snd_jack_dev_register(struct snd_device *device)

{

	struct snd_jack *jack = device->device_data;
@@ -116,6 +121,7 @@ static int snd_jack_dev_register(struct snd_device *device) 


	return err;

}

#endif /* CONFIG_SND_JACK_INPUT_DEV */



static void snd_jack_kctl_private_free(struct snd_kcontrol *kctl)

{
@@ -209,11 +215,12 @@ int snd_jack_new(struct snd_card *card, const char *id, int type, 
	struct snd_jack *jack;

	struct snd_jack_kctl *jack_kctl = NULL;

	int err;

	int i;

	static struct snd_device_ops ops = {

		.dev_free = snd_jack_dev_free,

#ifdef CONFIG_SND_JACK_INPUT_DEV

		.dev_register = snd_jack_dev_register,

		.dev_disconnect = snd_jack_dev_disconnect,

#endif /* CONFIG_SND_JACK_INPUT_DEV */

	};



	if (initial_kctl) {
@@ -230,6 +237,9 @@ int snd_jack_new(struct snd_card *card, const char *id, int type, 


	/* don't creat input device for phantom jack */

	if (!phantom_jack) {

#ifdef CONFIG_SND_JACK_INPUT_DEV

		int i;



		jack->input_dev = input_allocate_device();

		if (jack->input_dev == NULL) {

			err = -ENOMEM;
@@ -245,6 +255,7 @@ int snd_jack_new(struct snd_card *card, const char *id, int type, 
				input_set_capability(jack->input_dev, EV_SW,

						     jack_switch_types[i]);



#endif /* CONFIG_SND_JACK_INPUT_DEV */

	}



	err = snd_device_new(card, SNDRV_DEV_JACK, jack, &ops);
@@ -262,13 +273,16 @@ int snd_jack_new(struct snd_card *card, const char *id, int type, 
	return 0;



fail_input:

#ifdef CONFIG_SND_JACK_INPUT_DEV

	input_free_device(jack->input_dev);

#endif

	kfree(jack->id);

	kfree(jack);

	return err;

}

EXPORT_SYMBOL(snd_jack_new);



#ifdef CONFIG_SND_JACK_INPUT_DEV

/**

 * snd_jack_set_parent - Set the parent device for a jack

 *
@@ -326,10 +340,10 @@ int snd_jack_set_key(struct snd_jack *jack, enum snd_jack_types type, 


	jack->type |= type;

	jack->key[key] = keytype;



	return 0;

}

EXPORT_SYMBOL(snd_jack_set_key);

#endif /* CONFIG_SND_JACK_INPUT_DEV */



/**

 * snd_jack_report - Report the current status of a jack
@@ -340,7 +354,9 @@ EXPORT_SYMBOL(snd_jack_set_key); 
void snd_jack_report(struct snd_jack *jack, int status)

{

	struct snd_jack_kctl *jack_kctl;

#ifdef CONFIG_SND_JACK_INPUT_DEV

	int i;

#endif



	if (!jack)

		return;
@@ -349,6 +365,7 @@ void snd_jack_report(struct snd_jack *jack, int status) 
		snd_kctl_jack_report(jack->card, jack_kctl->kctl,

					    status & jack_kctl->mask_bits);



#ifdef CONFIG_SND_JACK_INPUT_DEV

	if (!jack->input_dev)

		return;
@@ -369,6 +386,6 @@ void snd_jack_report(struct snd_jack *jack, int status) 
	}



	input_sync(jack->input_dev);



#endif /* CONFIG_SND_JACK_INPUT_DEV */

}

EXPORT_SYMBOL(snd_jack_report);

sound/pci/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -866,7 +866,7 @@ config SND_VIRTUOSO 
	select SND_OXYGEN_LIB

	select SND_PCM

	select SND_MPU401_UART

	select SND_JACK if INPUT=y || INPUT=SND

	select SND_JACK

	help

	  Say Y here to include support for sound cards based on the

	  Asus AV66/AV100/AV200 chips, i.e., Xonar D1, DX, D2, D2X, DS, DSX,

sound/pci/hda/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ config SND_HDA 
	tristate

	select SND_PCM

	select SND_VMASTER

	select SND_JACK if INPUT=y || INPUT=SND

	select SND_JACK

	select SND_HDA_CORE



config SND_HDA_INTEL

CRA Git | Maintained and supported by SUSTech CRA and CCSE