Merge branch 'v28-timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

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

diff --git a/sound/core/jack.c b/sound/core/jack.c
index 8133a2b173a58bfe38603bf694a3245a746c90be..bd2d9e6b55e94876af21c7c9894ce00a9df60847 100644 (file)
--- a/sound/core/jack.c
+++ b/sound/core/jack.c
@@ -147,6 +147,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);