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

aef60a50 · Mark Brown · 7fc7d82f · bd23ee0c · aef60a50 · aef60a50
Commit aef60a50 authored Aug 22, 2013 by Mark Brown
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 6 deletions

sound/soc/cirrus/ep93xx-ac97.c sound/soc/cirrus/ep93xx-ac97.c +0 -3

sound/soc/cirrus/ep93xx-i2s.c sound/soc/cirrus/ep93xx-i2s.c +0 -3

No files found.
--- 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);

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