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

Commit aef60a50 authored by Mark Brown's avatar Mark Brown
Browse files

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

parents 7fc7d82f bd23ee0c

sound/soc/cirrus/ep93xx-ac97.c

+0 −3
Original line number Original line Diff line number Diff line
@@ -363,9 +363,6 @@ static int ep93xx_ac97_probe(struct platform_device *pdev) 
		return -ENOMEM;

		return -ENOMEM;





	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	if (!res)

		return -ENODEV;



	info->regs = devm_ioremap_resource(&pdev->dev, res);

	info->regs = devm_ioremap_resource(&pdev->dev, res);

	if (IS_ERR(info->regs))

	if (IS_ERR(info->regs))

		return PTR_ERR(info->regs);

		return PTR_ERR(info->regs);

sound/soc/cirrus/ep93xx-i2s.c

+0 −3
Original line number Original line Diff line number Diff line
@@ -376,9 +376,6 @@ static int ep93xx_i2s_probe(struct platform_device *pdev) 
		return -ENOMEM;

		return -ENOMEM;





	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	if (!res)

		return -ENODEV;



	info->regs = devm_ioremap_resource(&pdev->dev, res);

	info->regs = devm_ioremap_resource(&pdev->dev, res);

	if (IS_ERR(info->regs))

	if (IS_ERR(info->regs))

		return PTR_ERR(info->regs);

		return PTR_ERR(info->regs);