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

Commit 6be1cbfb authored by Mark Brown's avatar Mark Brown
Browse files

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

parents 4f9a84fe 41c4d554

sound/soc/omap/omap-mcpdm.c

+0 −4
Original line number Diff line number Diff line
@@ -449,10 +449,6 @@ static int asoc_mcpdm_probe(struct platform_device *pdev) 
	omap_mcpdm_dai_dma_params[0].port_addr = res->start + MCPDM_REG_DN_DATA;

	omap_mcpdm_dai_dma_params[1].port_addr = res->start + MCPDM_REG_UP_DATA;



	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	if (res == NULL)

		return -ENOMEM;



	res = platform_get_resource_byname(pdev, IORESOURCE_DMA, "dn_link");

	if (!res)

		return -ENODEV;