diff options
| author | Mark Brown <broonie@kernel.org> | 2016-07-24 22:07:23 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-07-24 22:07:23 +0100 |
| commit | 7b1ad4020422729d8e58486a4d98b30c666c9534 (patch) | |
| tree | 555bf13921abfbbbc43ffce3a9e98f77e2851a8f /sound | |
| parent | 44d624622e57ad60e652da4d7bde43aadab350bf (diff) | |
| parent | a074ae0ed68385ee403e4247ce8274705fe9c4e0 (diff) | |
| download | lwn-7b1ad4020422729d8e58486a4d98b30c666c9534.tar.gz lwn-7b1ad4020422729d8e58486a4d98b30c666c9534.zip | |
Merge remote-tracking branch 'asoc/topic/pcm1681' into asoc-next
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/codecs/pcm1681.c | 2 | ||||
| -rw-r--r-- | sound/soc/codecs/pcm179x.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/codecs/pcm1681.c b/sound/soc/codecs/pcm1681.c index 58325234285c..33e1fc2d1598 100644 --- a/sound/soc/codecs/pcm1681.c +++ b/sound/soc/codecs/pcm1681.c @@ -73,7 +73,7 @@ static bool pcm1681_accessible_reg(struct device *dev, unsigned int reg) return !((reg == 0x00) || (reg == 0x0f)); } -static bool pcm1681_writeable_reg(struct device *dev, unsigned register reg) +static bool pcm1681_writeable_reg(struct device *dev, unsigned int reg) { return pcm1681_accessible_reg(dev, reg) && (reg != PCM1681_ZERO_DETECT_STATUS); diff --git a/sound/soc/codecs/pcm179x.c b/sound/soc/codecs/pcm179x.c index 06a66579ca6d..88fbdd184aa0 100644 --- a/sound/soc/codecs/pcm179x.c +++ b/sound/soc/codecs/pcm179x.c @@ -59,7 +59,7 @@ static bool pcm179x_accessible_reg(struct device *dev, unsigned int reg) return reg >= 0x10 && reg <= 0x17; } -static bool pcm179x_writeable_reg(struct device *dev, unsigned register reg) +static bool pcm179x_writeable_reg(struct device *dev, unsigned int reg) { bool accessible; |