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

Commit 78e9fa52 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'spi/fix/hspi' into spi-linus

parents 5acb8bb4 268d7643

drivers/spi/spi-sh-hspi.c

+2 −2
Original line number Diff line number Diff line
@@ -296,6 +296,8 @@ static int hspi_probe(struct platform_device *pdev) 
		goto error1;

	}



	pm_runtime_enable(&pdev->dev);



	master->num_chipselect	= 1;

	master->bus_num		= pdev->id;

	master->setup		= hspi_setup;
@@ -309,8 +311,6 @@ static int hspi_probe(struct platform_device *pdev) 
		goto error1;

	}



	pm_runtime_enable(&pdev->dev);



	return 0;



 error1: