diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-10-27 17:06:43 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-10-27 17:06:43 +0200 |
| commit | 8128c9f21509f9a8b6da94ac432d845dda458406 (patch) | |
| tree | 587b5e785571ac7630c7f2b31cbbca6e70cc0d4b /sound/pci/hda/hda_local.h | |
| parent | bb14eb0da72afb69be261b28ec858cbd5a35e089 (diff) | |
| parent | 6b45214277bec2193ad3ccb8d7aa6100b5a0f1a9 (diff) | |
Merge branch 'topic/hda' into for-linus
Diffstat (limited to 'sound/pci/hda/hda_local.h')
| -rw-r--r-- | sound/pci/hda/hda_local.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/pci/hda/hda_local.h b/sound/pci/hda/hda_local.h index 46c581c3fa8..81e12c0ed0a 100644 --- a/sound/pci/hda/hda_local.h +++ b/sound/pci/hda/hda_local.h @@ -600,7 +600,8 @@ int snd_hda_check_amp_list_power(struct hda_codec *codec, #define get_amp_nid_(pv) ((pv) & 0xffff) #define get_amp_nid(kc) get_amp_nid_((kc)->private_value) #define get_amp_channels(kc) (((kc)->private_value >> 16) & 0x3) -#define get_amp_direction(kc) (((kc)->private_value >> 18) & 0x1) +#define get_amp_direction_(pv) (((pv) >> 18) & 0x1) +#define get_amp_direction(kc) get_amp_direction_((kc)->private_value) #define get_amp_index(kc) (((kc)->private_value >> 19) & 0xf) #define get_amp_offset(kc) (((kc)->private_value >> 23) & 0x3f) #define get_amp_min_mute(kc) (((kc)->private_value >> 29) & 0x1) |