Merge remote-tracking branch 'asoc/topic/pcm1681' into asoc-next

This commit is contained in:
Mark Brown 2016-07-24 22:07:23 +01:00
commit 7b1ad40204
2 changed files with 2 additions and 2 deletions

View file

@ -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);

View file

@ -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;