diff options
| author | Peter Chen <peter.chen@freescale.com> | 2014-12-31 16:06:49 +0800 |
|---|---|---|
| committer | Peter Chen <peter.chen@freescale.com> | 2015-01-04 14:54:52 +0800 |
| commit | 496fbe0b831b77d0ea0a2c7bbd1d58820b3a01f7 (patch) | |
| tree | 46fb95f93bbb3218fefe88127c74681e344fbc9a /sound/usb/mixer.h | |
| parent | 6cb794b964ea4a8f00116c800a7075c3b67fff6b (diff) | |
MLK-10067 Revert "ALSA: usb-audio: Resume mixer values properly"rel_imx_3.10.53_1.1.0_ga
This reverts commit 178bb7bed5b467463a3861aecdd5361ea9d295b7.
It causes the USB audio which defines quirk will be dead lock at its resume code
Signed-off-by: Peter Chen <peter.chen@freescale.com>
Diffstat (limited to 'sound/usb/mixer.h')
| -rw-r--r-- | sound/usb/mixer.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/sound/usb/mixer.h b/sound/usb/mixer.h index 73b1f649447b..aab80df201bd 100644 --- a/sound/usb/mixer.h +++ b/sound/usb/mixer.h @@ -63,6 +63,8 @@ void snd_usb_mixer_notify_id(struct usb_mixer_interface *mixer, int unitid); int snd_usb_mixer_set_ctl_value(struct usb_mixer_elem_info *cval, int request, int validx, int value_set); +void snd_usb_mixer_inactivate(struct usb_mixer_interface *mixer); +int snd_usb_mixer_activate(struct usb_mixer_interface *mixer); int snd_usb_mixer_add_control(struct usb_mixer_interface *mixer, struct snd_kcontrol *kctl); @@ -70,9 +72,4 @@ int snd_usb_mixer_add_control(struct usb_mixer_interface *mixer, int snd_usb_mixer_vol_tlv(struct snd_kcontrol *kcontrol, int op_flag, unsigned int size, unsigned int __user *_tlv); -#ifdef CONFIG_PM -int snd_usb_mixer_suspend(struct usb_mixer_interface *mixer); -int snd_usb_mixer_resume(struct usb_mixer_interface *mixer, bool reset_resume); -#endif - #endif /* __USBMIXER_H */ |