diff options
| author | Mark Brown <broonie@linaro.org> | 2013-08-22 09:28:38 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-08-22 09:28:38 -0400 |
| commit | aef60a5029e9236539ea2bbc910ed72f6bd5252a (patch) | |
| tree | a4986279efcb7421564c19f997f77be9dd55905a /sound/soc/cirrus/ep93xx-ac97.c | |
| parent | 7fc7d82fde85e2a7b948b835ebdc77e224685b6c (diff) | |
| parent | bd23ee0c5e2af1d3cdef813039384abd400dcffc (diff) | |
Merge remote-tracking branch 'asoc/topic/ep93xx' into asoc-next
Diffstat (limited to 'sound/soc/cirrus/ep93xx-ac97.c')
| -rw-r--r-- | sound/soc/cirrus/ep93xx-ac97.c | 3 |
1 files changed, 0 insertions, 3 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) | |||
| 363 | return -ENOMEM; | 363 | return -ENOMEM; |
| 364 | 364 | ||
| 365 | res = platform_get_resource(pdev, IORESOURCE_MEM, 0); | 365 | res = platform_get_resource(pdev, IORESOURCE_MEM, 0); |
| 366 | if (!res) | ||
| 367 | return -ENODEV; | ||
| 368 | |||
| 369 | info->regs = devm_ioremap_resource(&pdev->dev, res); | 366 | info->regs = devm_ioremap_resource(&pdev->dev, res); |
| 370 | if (IS_ERR(info->regs)) | 367 | if (IS_ERR(info->regs)) |
| 371 | return PTR_ERR(info->regs); | 368 | return PTR_ERR(info->regs); |