diff options
author | Takashi Iwai <tiwai@suse.de> | 2008-11-21 03:11:50 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2008-11-21 03:17:30 -0500 |
commit | f208dba97f2f3ff2fbcbe771195061e2a0dac870 (patch) | |
tree | 0c9bf38427af8c3c44e6c8e47cbc0ecf7e11f009 /sound/pci/hda/hda_local.h | |
parent | b94d3539de59ec6481e38f83c455324fd3aeabc1 (diff) |
ALSA: hda - Release ELD proc file
Release ELD proc file when reconfigured so that no leak occurs.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/hda/hda_local.h')
-rw-r--r-- | sound/pci/hda/hda_local.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/sound/pci/hda/hda_local.h b/sound/pci/hda/hda_local.h index c71505a4f99d..bf7ba8b62973 100644 --- a/sound/pci/hda/hda_local.h +++ b/sound/pci/hda/hda_local.h | |||
@@ -481,6 +481,9 @@ struct hdmi_eld { | |||
481 | int spk_alloc; | 481 | int spk_alloc; |
482 | int sad_count; | 482 | int sad_count; |
483 | struct cea_sad sad[ELD_MAX_SAD]; | 483 | struct cea_sad sad[ELD_MAX_SAD]; |
484 | #ifdef CONFIG_PROC_FS | ||
485 | struct snd_info_entry *proc_entry; | ||
486 | #endif | ||
484 | }; | 487 | }; |
485 | 488 | ||
486 | int snd_hdmi_get_eld_size(struct hda_codec *codec, hda_nid_t nid); | 489 | int snd_hdmi_get_eld_size(struct hda_codec *codec, hda_nid_t nid); |
@@ -489,12 +492,17 @@ void snd_hdmi_show_eld(struct hdmi_eld *eld); | |||
489 | 492 | ||
490 | #ifdef CONFIG_PROC_FS | 493 | #ifdef CONFIG_PROC_FS |
491 | int snd_hda_eld_proc_new(struct hda_codec *codec, struct hdmi_eld *eld); | 494 | int snd_hda_eld_proc_new(struct hda_codec *codec, struct hdmi_eld *eld); |
495 | void snd_hda_eld_proc_free(struct hda_codec *codec, struct hdmi_eld *eld); | ||
492 | #else | 496 | #else |
493 | static inline int snd_hda_eld_proc_new(struct hda_codec *codec, | 497 | static inline int snd_hda_eld_proc_new(struct hda_codec *codec, |
494 | struct hdmi_eld *eld) | 498 | struct hdmi_eld *eld) |
495 | { | 499 | { |
496 | return 0; | 500 | return 0; |
497 | } | 501 | } |
502 | static inline void snd_hda_eld_proc_free(struct hda_codec *codec, | ||
503 | struct hdmi_eld *eld) | ||
504 | { | ||
505 | } | ||
498 | #endif | 506 | #endif |
499 | 507 | ||
500 | #define SND_PRINT_CHANNEL_ALLOCATION_ADVISED_BUFSIZE 80 | 508 | #define SND_PRINT_CHANNEL_ALLOCATION_ADVISED_BUFSIZE 80 |