diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-04-15 11:24:09 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-04-15 11:24:09 +0200 |
| commit | 2e8e59f437ce303fde2077cc5f84ce03c6ff1020 (patch) | |
| tree | 49af09dab4d2ec3390d66bac3e55fd8defbba613 /sound/core | |
| parent | 45c27fc8c89d39956930abeff8433c33d07a8d5f (diff) | |
| parent | ff0c68d03b77ecb3a682137c42e947a4dc33e9b3 (diff) | |
| download | linux-2.6-2e8e59f437ce303fde2077cc5f84ce03c6ff1020.tar.gz linux-2.6-2e8e59f437ce303fde2077cc5f84ce03c6ff1020.tar.xz | |
Merge branch 'topic/hda' into for-linus
* topic/hda:
ALSA: hda - Add quirk mask for Fujitsu Amilo laptops with ALC883
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 c8254c667c6..d54d1a05fe6 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) |