diff options
| author | Mark Brown <broonie@linaro.org> | 2013-08-22 14:28:38 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-08-22 14:28:38 +0100 |
| commit | aef60a5029e9236539ea2bbc910ed72f6bd5252a (patch) | |
| tree | a4986279efcb7421564c19f997f77be9dd55905a /sound/soc/cirrus | |
| parent | 7fc7d82fde85e2a7b948b835ebdc77e224685b6c (diff) | |
| parent | bd23ee0c5e2af1d3cdef813039384abd400dcffc (diff) | |
| download | linux-aef60a5029e9236539ea2bbc910ed72f6bd5252a.tar.gz linux-aef60a5029e9236539ea2bbc910ed72f6bd5252a.tar.bz2 linux-aef60a5029e9236539ea2bbc910ed72f6bd5252a.zip | |
Merge remote-tracking branch 'asoc/topic/ep93xx' into asoc-next
Diffstat (limited to 'sound/soc/cirrus')
| -rw-r--r-- | sound/soc/cirrus/ep93xx-ac97.c | 3 | ||||
| -rw-r--r-- | sound/soc/cirrus/ep93xx-i2s.c | 3 |
2 files changed, 0 insertions, 6 deletions
diff --git a/sound/soc/cirrus/ep93xx-ac97.c b/sound/soc/cirrus/ep93xx-ac97.c index 04491f0e8d1b..efa75b5086a4 100644 --- a/sound/soc/cirrus/ep93xx-ac97.c +++ b/sound/soc/cirrus/ep93xx-ac97.c @@ -363,9 +363,6 @@ static int ep93xx_ac97_probe(struct platform_device *pdev) return -ENOMEM; res = platform_get_resource(pdev, IORESOURCE_MEM, 0); - if (!res) - return -ENODEV; - info->regs = devm_ioremap_resource(&pdev->dev, res); if (IS_ERR(info->regs)) return PTR_ERR(info->regs); diff --git a/sound/soc/cirrus/ep93xx-i2s.c b/sound/soc/cirrus/ep93xx-i2s.c index 17ad70bca9fe..f23f331e9a97 100644 --- a/sound/soc/cirrus/ep93xx-i2s.c +++ b/sound/soc/cirrus/ep93xx-i2s.c @@ -376,9 +376,6 @@ static int ep93xx_i2s_probe(struct platform_device *pdev) return -ENOMEM; res = platform_get_resource(pdev, IORESOURCE_MEM, 0); - if (!res) - return -ENODEV; - info->regs = devm_ioremap_resource(&pdev->dev, res); if (IS_ERR(info->regs)) return PTR_ERR(info->regs); |