diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-04-15 11:23:44 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-04-15 11:23:44 +0200 |
| commit | ff0c68d03b77ecb3a682137c42e947a4dc33e9b3 (patch) | |
| tree | eb9b5103513692c10fa48a4a8cbae9a1efa12663 /sound/core | |
| parent | ALSA: hda - Add quirk mask for Fujitsu Amilo laptops with ALC883 (diff) | |
| parent | ALSA: hda - Avoid call of snd_jack_report at release (diff) | |
| download | linux-ff0c68d03b77ecb3a682137c42e947a4dc33e9b3.tar.xz linux-ff0c68d03b77ecb3a682137c42e947a4dc33e9b3.zip | |
Merge branch 'topic/jack-free-fix' into topic/hda
* topic/jack-free-fix:
ALSA: hda - Avoid call of snd_jack_report at release
ALSA: add private_data to struct snd_jack
Diffstat (limited to 'sound/core')
| -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 c8254c667c62..d54d1a05fe65 100644 --- a/sound/core/jack.c +++ b/sound/core/jack.c @@ -35,6 +35,9 @@ static int snd_jack_dev_free(struct snd_device *device) { struct snd_jack *jack = device->device_data; + if (jack->private_free) + jack->private_free(jack); + /* If the input device is registered with the input subsystem * then we need to use a different deallocator. */ if (jack->registered) |