]> Pileus Git - ~andy/linux/commitdiff
spi/pxa2xx: initialize DMA channels to -1 to prevent inadvertent match
authorMika Westerberg <mika.westerberg@linux.intel.com>
Mon, 13 Jan 2014 09:17:04 +0000 (11:17 +0200)
committerMark Brown <broonie@linaro.org>
Mon, 13 Jan 2014 12:39:19 +0000 (12:39 +0000)
Commit cddb339badb0 (spi/pxa2xx: convert to dma_request_slave_channel_compat())
converted the driver to use ACPI provided DMA helpers but it forgot to
initialize the platform data for the channels to -1. Failing to do so will
result inadvertent match in the filter function because 0 is a valid
channel number.

Prevent this from happening by initializing both platform data channels
correctly to -1.

Fixes: cddb339badb0 (spi/pxa2xx: convert to dma_request_slave_channel_compat())
Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
Cc: stable@vger.kernel.org
drivers/spi/spi-pxa2xx.c

index cb0e1f1137adb65384188ce31651171cb3f5f311..91815fa2d2fe10dc7315e2e0ceb4f081a84201c6 100644 (file)
@@ -1066,6 +1066,8 @@ pxa2xx_spi_acpi_get_pdata(struct platform_device *pdev)
 
        pdata->num_chipselect = 1;
        pdata->enable_dma = true;
+       pdata->tx_chan_id = -1;
+       pdata->rx_chan_id = -1;
 
        return pdata;
 }