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

49ffa3b1 · Mark Brown · c8a53841 · 916dd413 · 49ffa3b1
Commit 49ffa3b1 authored Aug 22, 2013 by Mark Brown
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

sound/soc/nuc900/nuc900-ac97.c sound/soc/nuc900/nuc900-ac97.c +0 -3

No files found.
--- a/sound/soc/nuc900/nuc900-ac97.c
+++ b/sound/soc/nuc900/nuc900-ac97.c
@@ -333,9 +333,6 @@ static int nuc900_ac97_drvprobe(struct platform_device *pdev)
 	spin_lock_init(&nuc900_audio->lock);
 	nuc900_audio->res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-	if (!nuc900_audio->res)
-		return ret;
 	nuc900_audio->mmio = devm_ioremap_resource(&pdev->dev,
 						   nuc900_audio->res);
 	if (IS_ERR(nuc900_audio->mmio))