diff options
author | Takashi Iwai <tiwai@suse.de> | 2008-12-19 08:22:57 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2008-12-19 08:22:57 +0100 |
commit | 0ff555192a8d20385d49d1c420e2e8d409b3c0da (patch) | |
tree | b6e4b6cae1028a310a3488ebf745954c51694bfc /sound/core/jack.c | |
parent | 3218c178b41b420cb7e0d120c7a137a3969242e5 (diff) | |
parent | 9e43f0de690211cf7153b5f3ec251bc315647ada (diff) | |
download | op-kernel-dev-0ff555192a8d20385d49d1c420e2e8d409b3c0da.zip op-kernel-dev-0ff555192a8d20385d49d1c420e2e8d409b3c0da.tar.gz |
Merge branch 'fix/hda' into topic/hda
Diffstat (limited to 'sound/core/jack.c')
-rw-r--r-- | sound/core/jack.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sound/core/jack.c b/sound/core/jack.c index 438445f..284432f 100644 --- a/sound/core/jack.c +++ b/sound/core/jack.c @@ -151,6 +151,9 @@ EXPORT_SYMBOL(snd_jack_set_parent); */ void snd_jack_report(struct snd_jack *jack, int status) { + if (!jack) + return; + if (jack->type & SND_JACK_HEADPHONE) input_report_switch(jack->input_dev, SW_HEADPHONE_INSERT, status & SND_JACK_HEADPHONE); |