]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
ALSA: Handle NULL jacks in snd_jack_report()
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 15 Oct 2008 16:07:47 +0000 (17:07 +0100)
committerTakashi Iwai <tiwai@suse.de>
Thu, 16 Oct 2008 06:40:03 +0000 (08:40 +0200)
Facilitate drivers that wish to carry on if they can't create a jack
input device by handling attempts to report the state of a NULL jack,
removing the need to check for initialisation before use.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/core/jack.c

index 8133a2b173a58bfe38603bf694a3245a746c90be..bd2d9e6b55e94876af21c7c9894ce00a9df60847 100644 (file)
@@ -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);