summaryrefslogtreecommitdiffstats
path: root/sound/hda
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2015-03-09 22:19:47 +0100
committerTakashi Iwai <tiwai@suse.de>2015-03-23 13:19:43 +0100
commit33f819400659da9ff9f636b78f33ff4f1f08cbd4 (patch)
treebbb736ecbd1b38f750ddd6a921e323fb456a896e /sound/hda
parentd313e0a88d1b29d17198ef659af042a633a2d3de (diff)
downloadop-kernel-dev-33f819400659da9ff9f636b78f33ff4f1f08cbd4.zip
op-kernel-dev-33f819400659da9ff9f636b78f33ff4f1f08cbd4.tar.gz
ALSA: hda - Handle get/set power verb symmetrically via regmap
HD-audio has quite a few asymmetrical ways of accessing verbs, and one of typical ones is GET/SET_POWER_STATE verbs. While it takes only the power state for setting, it returns a combination of states for getting. For making the state handling simpler, this patch adds a code to translate the value returned from GET_POWER_STATE to return only the actual state or -1 for error. In that way, the driver can simplify the power state management. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/hda')
-rw-r--r--sound/hda/hdac_regmap.c13
1 files changed, 12 insertions, 1 deletions
diff --git a/sound/hda/hdac_regmap.c b/sound/hda/hdac_regmap.c
index fb4a02e..2eea8d4 100644
--- a/sound/hda/hdac_regmap.c
+++ b/sound/hda/hdac_regmap.c
@@ -191,13 +191,24 @@ static int hda_reg_write_stereo_amp(struct hdac_device *codec,
static int hda_reg_read(void *context, unsigned int reg, unsigned int *val)
{
struct hdac_device *codec = context;
+ int err;
if (!codec_is_running(codec))
return -EAGAIN;
reg |= (codec->addr << 28);
if (is_stereo_amp_verb(reg))
return hda_reg_read_stereo_amp(codec, reg, val);
- return snd_hdac_exec_verb(codec, reg, 0, val);
+ err = snd_hdac_exec_verb(codec, reg, 0, val);
+ if (err < 0)
+ return err;
+ /* special handling for asymmetric reads */
+ if (get_verb(reg) == AC_VERB_GET_POWER_STATE) {
+ if (*val & AC_PWRST_ERROR)
+ *val = -1;
+ else /* take only the actual state */
+ *val = (*val >> 4) & 0x0f;
+ }
+ return 0;
}
static int hda_reg_write(void *context, unsigned int reg, unsigned int val)
OpenPOWER on IntegriCloud