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 /include | |
| parent | bfb53037c61ddf7c16a40297ad16f2bcbde534dc (diff) | |
| parent | 95c0909961bc5ff18c78b2ab0d093cddc0a8b0b5 (diff) | |
| download | linux-ff0c68d03b77ecb3a682137c42e947a4dc33e9b3.tar.gz linux-ff0c68d03b77ecb3a682137c42e947a4dc33e9b3.tar.bz2 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 'include')
| -rw-r--r-- | include/sound/jack.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/sound/jack.h b/include/sound/jack.h index 6b013c6f6a04..f236e426a706 100644 --- a/include/sound/jack.h +++ b/include/sound/jack.h @@ -50,6 +50,8 @@ struct snd_jack { int type; const char *id; char name[100]; + void *private_data; + void (*private_free)(struct snd_jack *); }; #ifdef CONFIG_SND_JACK |