diff options
| author | Takashi Iwai <tiwai@suse.de> | 2018-06-04 05:41:48 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2018-06-04 05:42:27 -0400 |
| commit | cdbc653a04ee692a7105a96e8dd6055d9971d45c (patch) | |
| tree | c1282680b3115edfd693a27bc6758208534ac557 /sound/soc/codecs/cs43130.c | |
| parent | 009f8c90f571d87855914dbc20e6c0ea2a3b19ae (diff) | |
| parent | ceec4684085a9e4dc60439d84ab47ce260444804 (diff) | |
Merge branch 'for-next' into for-linus
4.18-rc1 merge material.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/soc/codecs/cs43130.c')
| -rw-r--r-- | sound/soc/codecs/cs43130.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/soc/codecs/cs43130.c b/sound/soc/codecs/cs43130.c index feca0a672976..80dc42197154 100644 --- a/sound/soc/codecs/cs43130.c +++ b/sound/soc/codecs/cs43130.c | |||
| @@ -1733,10 +1733,10 @@ static ssize_t cs43130_show_ac_r(struct device *dev, | |||
| 1733 | return cs43130_show_ac(dev, buf, HP_RIGHT); | 1733 | return cs43130_show_ac(dev, buf, HP_RIGHT); |
| 1734 | } | 1734 | } |
| 1735 | 1735 | ||
| 1736 | static DEVICE_ATTR(hpload_dc_l, S_IRUGO, cs43130_show_dc_l, NULL); | 1736 | static DEVICE_ATTR(hpload_dc_l, 0444, cs43130_show_dc_l, NULL); |
| 1737 | static DEVICE_ATTR(hpload_dc_r, S_IRUGO, cs43130_show_dc_r, NULL); | 1737 | static DEVICE_ATTR(hpload_dc_r, 0444, cs43130_show_dc_r, NULL); |
| 1738 | static DEVICE_ATTR(hpload_ac_l, S_IRUGO, cs43130_show_ac_l, NULL); | 1738 | static DEVICE_ATTR(hpload_ac_l, 0444, cs43130_show_ac_l, NULL); |
| 1739 | static DEVICE_ATTR(hpload_ac_r, S_IRUGO, cs43130_show_ac_r, NULL); | 1739 | static DEVICE_ATTR(hpload_ac_r, 0444, cs43130_show_ac_r, NULL); |
| 1740 | 1740 | ||
| 1741 | static struct reg_sequence hp_en_cal_seq[] = { | 1741 | static struct reg_sequence hp_en_cal_seq[] = { |
| 1742 | {CS43130_INT_MASK_4, CS43130_INT_MASK_ALL}, | 1742 | {CS43130_INT_MASK_4, CS43130_INT_MASK_ALL}, |