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

Commit 5acb8bb4 authored by Mark Brown's avatar Mark Brown
Browse files

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

parents a19be58c 272bfbd5

drivers/spi/spi-fsl-dspi.c

+2 −8
Original line number Diff line number Diff line
@@ -476,15 +476,9 @@ static int dspi_probe(struct platform_device *pdev) 
	master->bus_num = bus_num;



	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	if (!res) {

		dev_err(&pdev->dev, "can't get platform resource\n");

		ret = -EINVAL;

		goto out_master_put;

	}



	dspi->base = devm_ioremap_resource(&pdev->dev, res);

	if (!dspi->base) {

		ret = -EINVAL;

	if (IS_ERR(dspi->base)) {

		ret = PTR_ERR(dspi->base);

		goto out_master_put;

	}