From 43b2cd547edcba4733bf21ea2b3f6600e3bdc514 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Thu, 30 Apr 2015 15:25:00 +0200 Subject: 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: 2ba2dfa1fcc7 ('ALSA: hda - Update to use the new jack kctls method') Signed-off-by: Takashi Iwai --- sound/core/jack.c | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'sound/core/jack.c') diff --git a/sound/core/jack.c b/sound/core/jack.c index 0dbd618e3c94..eb66327b5f1c 100644 --- a/sound/core/jack.c +++ b/sound/core/jack.c @@ -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; } -- cgit v1.2.3-55-g7522