Commit 43b2cd54 authored by Takashi Iwai's avatar Takashi Iwai

ALSA: jack: Fix another NULL dereference due to empty input jack

Another fixes for NULL jack->input_dev in some places in jack.c.

Fixes: 2ba2dfa1 ('ALSA: hda - Update to use the new jack kctls method')
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 6ed9495e
......@@ -87,6 +87,10 @@ static int snd_jack_dev_register(struct snd_device *device)
snprintf(jack->name, sizeof(jack->name), "%s %s",
card->shortname, jack->id);
if (!jack->input_dev)
return 0;
jack->input_dev->name = jack->name;
/* Default to the sound card device. */
......@@ -278,6 +282,8 @@ EXPORT_SYMBOL(snd_jack_new);
void snd_jack_set_parent(struct snd_jack *jack, struct device *parent)
{
WARN_ON(jack->registered);
if (!jack->input_dev)
return;
jack->input_dev->dev.parent = parent;
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment