Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 49ffa3b1 authored by Mark Brown's avatar Mark Brown
Browse files

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

parents c8a53841 916dd413
Loading
Loading
Loading
Loading
+0 −3
Original line number Diff line number Diff line
@@ -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))