On Fri, Sep 23, 2011 at 11:49:36AM -0400, Jeff Harris wrote:
> If CPM mode is not used, the fsl_dummy_rx variable is never allocated.  When
> the cleanup attempts to free it, the reference count is zero and a WARN is
> generated.  The same CPM mode check used in the initialize is applied to the
> free as well.
> 
> Tested on 2.6.33 with the previous spi_mpc8xxx driver.  The renamed
> spi-fsl-spi driver looks to have the same problem.
> 
> Signed-off-by: Jeff Harris <[email protected]>

Merged, thanks.

g.

> ---
>  drivers/spi/spi-fsl-spi.c |    3 +++
>  1 files changed, 3 insertions(+), 0 deletions(-)
> 
> diff --git a/drivers/spi/spi-fsl-spi.c b/drivers/spi/spi-fsl-spi.c
> index d240755..24cacff 100644
> --- a/drivers/spi/spi-fsl-spi.c
> +++ b/drivers/spi/spi-fsl-spi.c
> @@ -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));
> -- 
> 1.7.0.5
> 

------------------------------------------------------------------------------
All of the data generated in your IT infrastructure is seriously valuable.
Why? It contains a definitive record of application performance, security
threats, fraudulent activity, and more. Splunk takes this data and makes
sense of it. IT sense. And common sense.
http://p.sf.net/sfu/splunk-d2dcopy2
_______________________________________________
spi-devel-general mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/spi-devel-general

Reply via email to