diff options
author | Clemens Ladisch <clemens@ladisch.de> | 2008-09-22 03:02:08 -0400 |
---|---|---|
committer | Clemens Ladisch <clemens@ladisch.de> | 2008-09-22 03:02:08 -0400 |
commit | d76596b1ee7f5cdbd0b73d374ba72372a2c8b725 (patch) | |
tree | 8ecb3fde83a1eb3c67efcb99c90ad993731ed479 /sound/pci/oxygen/oxygen_mixer.c | |
parent | c3f00739c5e45b4bf6f759172a5318256b92f2b2 (diff) |
ALSA: oxygen: rename pcm_dev_cfg
Rename the pcm_dev_cfg field to device_config because there will be
additional flags that do not describe PCM devices.
Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Diffstat (limited to 'sound/pci/oxygen/oxygen_mixer.c')
-rw-r--r-- | sound/pci/oxygen/oxygen_mixer.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/pci/oxygen/oxygen_mixer.c b/sound/pci/oxygen/oxygen_mixer.c index b7226b60eab6..304da169bfdc 100644 --- a/sound/pci/oxygen/oxygen_mixer.c +++ b/sound/pci/oxygen/oxygen_mixer.c | |||
@@ -974,14 +974,14 @@ int oxygen_mixer_init(struct oxygen *chip) | |||
974 | err = add_controls(chip, controls, ARRAY_SIZE(controls)); | 974 | err = add_controls(chip, controls, ARRAY_SIZE(controls)); |
975 | if (err < 0) | 975 | if (err < 0) |
976 | return err; | 976 | return err; |
977 | if (chip->model.pcm_dev_cfg & CAPTURE_1_FROM_SPDIF) { | 977 | if (chip->model.device_config & CAPTURE_1_FROM_SPDIF) { |
978 | err = add_controls(chip, spdif_input_controls, | 978 | err = add_controls(chip, spdif_input_controls, |
979 | ARRAY_SIZE(spdif_input_controls)); | 979 | ARRAY_SIZE(spdif_input_controls)); |
980 | if (err < 0) | 980 | if (err < 0) |
981 | return err; | 981 | return err; |
982 | } | 982 | } |
983 | for (i = 0; i < ARRAY_SIZE(monitor_controls); ++i) { | 983 | for (i = 0; i < ARRAY_SIZE(monitor_controls); ++i) { |
984 | if (!(chip->model.pcm_dev_cfg & monitor_controls[i].pcm_dev)) | 984 | if (!(chip->model.device_config & monitor_controls[i].pcm_dev)) |
985 | continue; | 985 | continue; |
986 | err = add_controls(chip, monitor_controls[i].controls, | 986 | err = add_controls(chip, monitor_controls[i].controls, |
987 | ARRAY_SIZE(monitor_controls[i].controls)); | 987 | ARRAY_SIZE(monitor_controls[i].controls)); |