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

Commit 67f31971 authored by Vinod Koul's avatar Vinod Koul
Browse files

Merge branch 'topic/txx' into for-linus

parents f1e3b4ce a8afcfeb

drivers/dma/txx9dmac.c

+3 −5
Original line number Diff line number Diff line
@@ -1244,8 +1244,7 @@ static void txx9dmac_shutdown(struct platform_device *pdev) 


static int txx9dmac_suspend_noirq(struct device *dev)

{

	struct platform_device *pdev = to_platform_device(dev);

	struct txx9dmac_dev *ddev = platform_get_drvdata(pdev);

	struct txx9dmac_dev *ddev = dev_get_drvdata(dev);



	txx9dmac_off(ddev);

	return 0;
@@ -1253,9 +1252,8 @@ static int txx9dmac_suspend_noirq(struct device *dev) 


static int txx9dmac_resume_noirq(struct device *dev)

{

	struct platform_device *pdev = to_platform_device(dev);

	struct txx9dmac_dev *ddev = platform_get_drvdata(pdev);

	struct txx9dmac_platform_data *pdata = dev_get_platdata(&pdev->dev);

	struct txx9dmac_dev *ddev = dev_get_drvdata(dev);

	struct txx9dmac_platform_data *pdata = dev_get_platdata(dev);

	u32 mcr;



	mcr = TXX9_DMA_MCR_MSTEN | MCR_LE;