Commit b172e38e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'spi/merge' of git://git.secretlab.ca/git/linux-2.6 

* 'spi/merge' of git://git.secretlab.ca/git/linux-2.6:
  spi: Fix WARN when removing spi-fsl-spi module
  spi/imx: Fix spi-imx when the hardware SPI chipselects are used
parents 8ec9c7fb 387719c2

drivers/spi/spi-fsl-spi.c

+3 −0
Original line number Diff line number Diff line
@@ -825,6 +825,9 @@ static void fsl_spi_cpm_free(struct mpc8xxx_spi *mspi) 
{

	struct device *dev = mspi->dev;



	if (!(mspi->flags & SPI_CPM_MODE))

		return;



	dma_unmap_single(dev, mspi->dma_dummy_rx, SPI_MRBLR, DMA_FROM_DEVICE);

	dma_unmap_single(dev, mspi->dma_dummy_tx, PAGE_SIZE, DMA_TO_DEVICE);

	cpm_muram_free(cpm_muram_offset(mspi->tx_bd));

drivers/spi/spi-imx.c

+3 −1
Original line number Diff line number Diff line
@@ -786,9 +786,11 @@ static int __devinit spi_imx_probe(struct platform_device *pdev) 
		int cs_gpio = of_get_named_gpio(np, "cs-gpios", i);

		if (cs_gpio < 0)

			cs_gpio = mxc_platform_info->chipselect[i];



		spi_imx->chipselect[i] = cs_gpio;

		if (cs_gpio < 0)

			continue;

		spi_imx->chipselect[i] = cs_gpio;



		ret = gpio_request(spi_imx->chipselect[i], DRIVER_NAME);

		if (ret) {

			while (i > 0) {