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

Commit f9e522ca authored by Vitja Makarov's avatar Vitja Makarov Committed by Linus Torvalds
Browse files

spi: spi_bfin5xx: fix probe() sequencing 



Fix bug in SPI probe: first initialize peripheral pins, and just after
register spi master device.  This fixes problems with SPI drivers built-in
kernel.

Singed-off-by: default avatarVitja Makarov <vitja.makarov@gmail.com>
Signed-off-by: default avatarBryan Wu <cooloney@kernel.org>
Signed-off-by: default avatarDavid Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 4fb98efa

drivers/spi/spi_bfin5xx.c

+6 −6
Original line number Diff line number Diff line
@@ -1294,6 +1294,12 @@ static int __init bfin5xx_spi_probe(struct platform_device *pdev) 
		goto out_error_queue_alloc;

	}



	status = peripheral_request_list(drv_data->pin_req, DRV_NAME);

	if (status != 0) {

		dev_err(&pdev->dev, ": Requesting Peripherals failed\n");

		goto out_error_queue_alloc;

	}



	/* Register with the SPI framework */

	platform_set_drvdata(pdev, drv_data);

	status = spi_register_master(master);
@@ -1302,12 +1308,6 @@ static int __init bfin5xx_spi_probe(struct platform_device *pdev) 
		goto out_error_queue_alloc;

	}



	status = peripheral_request_list(drv_data->pin_req, DRV_NAME);

	if (status != 0) {

		dev_err(&pdev->dev, ": Requesting Peripherals failed\n");

		goto out_error;

	}



	dev_info(dev, "%s, Version %s, regs_base@%p, dma channel@%d\n",

		DRV_DESC, DRV_VERSION, drv_data->regs_base,

		drv_data->dma_channel);