diff options
author | Mika Westerberg <mika.westerberg@linux.intel.com> | 2014-01-13 11:17:04 +0200 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2014-01-13 12:39:19 +0000 |
commit | 483c319188c74e82b29a0ed7a7fa7065570f2193 (patch) | |
tree | 6654f08957d355235eff55a8c36afde2745e1e21 /drivers/spi/spi-pxa2xx.c | |
parent | 6ce4eac1f600b34f2f7f58f9cd8f0503d79e42ae (diff) | |
download | linux-483c319188c74e82b29a0ed7a7fa7065570f2193.tar.gz linux-483c319188c74e82b29a0ed7a7fa7065570f2193.tar.bz2 linux-483c319188c74e82b29a0ed7a7fa7065570f2193.zip |
spi/pxa2xx: initialize DMA channels to -1 to prevent inadvertent match
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
Diffstat (limited to 'drivers/spi/spi-pxa2xx.c')
-rw-r--r-- | drivers/spi/spi-pxa2xx.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/spi/spi-pxa2xx.c b/drivers/spi/spi-pxa2xx.c index cb0e1f1137ad..91815fa2d2fe 100644 --- a/drivers/spi/spi-pxa2xx.c +++ b/drivers/spi/spi-pxa2xx.c @@ -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; } |