Merge branch 'fix/hda' into topic/hda

[linux-2.6-omap-h63xx.git] / sound / core / jack.c

diff --git a/sound/core/jack.c b/sound/core/jack.c
index 438445f77d6d8dd68eb3d4fd9ca846f2b3a6dc30..284432f427f4b7c32a178a11329520e112dedbee 100644 (file)
--- 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);