Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+6
-1
+3
drivers/spi/spi-fsl-spi.c
+3
drivers/spi/spi-fsl-spi.c
···
825
825
{
826
826
struct device *dev = mspi->dev;
827
827
828
+
if (!(mspi->flags & SPI_CPM_MODE))
829
+
return;
830
+
828
831
dma_unmap_single(dev, mspi->dma_dummy_rx, SPI_MRBLR, DMA_FROM_DEVICE);
829
832
dma_unmap_single(dev, mspi->dma_dummy_tx, PAGE_SIZE, DMA_TO_DEVICE);
830
833
cpm_muram_free(cpm_muram_offset(mspi->tx_bd));
+3
-1
drivers/spi/spi-imx.c
+3
-1
drivers/spi/spi-imx.c
···
786
786
int cs_gpio = of_get_named_gpio(np, "cs-gpios", i);
787
787
if (cs_gpio < 0)
788
788
cs_gpio = mxc_platform_info->chipselect[i];
789
+
790
+
spi_imx->chipselect[i] = cs_gpio;
789
791
if (cs_gpio < 0)
790
792
continue;
791
-
spi_imx->chipselect[i] = cs_gpio;
793
+
792
794
ret = gpio_request(spi_imx->chipselect[i], DRIVER_NAME);
793
795
if (ret) {
794
796
while (i > 0) {