diff options
| author | Alastair Bridgewater | 2018-06-16 03:56:18 +0200 |
|---|---|---|
| committer | Takashi Iwai | 2018-06-17 08:44:55 +0200 |
| commit | 126b75e03894f3053b723130cb9b824e6f15d8e6 (patch) | |
| tree | 810def04305efe7b93cefd47655f2ced83a0f04a /sound/pci | |
| parent | ALSA: hda/ca0132: Restore behavior of QUIRK_ALIENWARE (diff) | |
| download | kernel-qcow2-linux-126b75e03894f3053b723130cb9b824e6f15d8e6.tar.gz kernel-qcow2-linux-126b75e03894f3053b723130cb9b824e6f15d8e6.tar.xz kernel-qcow2-linux-126b75e03894f3053b723130cb9b824e6f15d8e6.zip | |
ALSA: hda/ca0132: Don't test for QUIRK_NONE
QUIRK_NONE is, quite explicitly, the default case. The entire
point of a quirks system is to allow "programming by difference"
from a given base case, which requires that merely defining a new
quirk for some piece of hardware should not change the behavior of
the driver for that hardware. In turn, this means that testing
for QUIRK_NONE explicitly is a violation of that implicit contract.
Change a test for QUIRK_NONE and QUIRK_ALIENWARE to default, and
add a test for QUIRK_SBZ to disable the default behavior in that
instance.
Signed-off-by: Alastair Bridgewater <alastair.bridgewater@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci')
| -rw-r--r-- | sound/pci/hda/patch_ca0132.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sound/pci/hda/patch_ca0132.c b/sound/pci/hda/patch_ca0132.c index 25fccce1eff1..49635d1c9c39 100644 --- a/sound/pci/hda/patch_ca0132.c +++ b/sound/pci/hda/patch_ca0132.c @@ -7237,8 +7237,9 @@ static int ca0132_init(struct hda_codec *codec) case QUIRK_R3DI: r3di_setup_defaults(codec); break; - case QUIRK_NONE: - case QUIRK_ALIENWARE: + case QUIRK_SBZ: + break; + default: ca0132_setup_defaults(codec); ca0132_init_analog_mic2(codec); ca0132_init_dmic(codec); |