diff options
| author | Mark Brown <broonie@linaro.org> | 2013-11-08 10:43:29 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-11-08 10:43:29 +0000 |
| commit | ec7118e39181a66144e6ae77ea7e24894362145a (patch) | |
| tree | bd641872931887e137863d74027f4dbf934632fa /sound/soc/fsl/fsl_spdif.c | |
| parent | 3352b80075a2dcc3ee6d7270620cba61878bfc05 (diff) | |
| parent | ea8e5e591801b0d0c25dc0a0f1f5b508be7004cb (diff) | |
| download | op-kernel-dev-ec7118e39181a66144e6ae77ea7e24894362145a.zip op-kernel-dev-ec7118e39181a66144e6ae77ea7e24894362145a.tar.gz | |
Merge remote-tracking branch 'asoc/topic/fsl' into asoc-next
Diffstat (limited to 'sound/soc/fsl/fsl_spdif.c')
| -rw-r--r-- | sound/soc/fsl/fsl_spdif.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/sound/soc/fsl/fsl_spdif.c b/sound/soc/fsl/fsl_spdif.c index 44378e6..55193a5 100644 --- a/sound/soc/fsl/fsl_spdif.c +++ b/sound/soc/fsl/fsl_spdif.c @@ -963,7 +963,7 @@ static bool fsl_spdif_readable_reg(struct device *dev, unsigned int reg) return true; default: return false; - }; + } } static bool fsl_spdif_writeable_reg(struct device *dev, unsigned int reg) @@ -982,7 +982,7 @@ static bool fsl_spdif_writeable_reg(struct device *dev, unsigned int reg) return true; default: return false; - }; + } } static const struct regmap_config fsl_spdif_regmap_config = { @@ -1107,11 +1107,6 @@ static int fsl_spdif_probe(struct platform_device *pdev) /* Get the addresses and IRQ */ res = platform_get_resource(pdev, IORESOURCE_MEM, 0); - if (IS_ERR(res)) { - dev_err(&pdev->dev, "could not determine device resources\n"); - return PTR_ERR(res); - } - regs = devm_ioremap_resource(&pdev->dev, res); if (IS_ERR(regs)) return PTR_ERR(regs); |
