diff options
| author | Bhuvanchandra DV <bhuvanchandra.dv@toradex.com> | 2015-01-31 22:03:25 +0530 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-02-02 20:05:19 +0000 |
| commit | ceadfd8de067e37d52e2af6bb60016cb90342fe8 (patch) | |
| tree | 1b3a76f797f5425f1ad42eb23f2791f5e785a22f /drivers/spi/spi-fsl-dspi.c | |
| parent | 9298bc727385cd625cdda5e877bd3cba8acff668 (diff) | |
| download | linux-stable-ceadfd8de067e37d52e2af6bb60016cb90342fe8.tar.gz linux-stable-ceadfd8de067e37d52e2af6bb60016cb90342fe8.tar.bz2 linux-stable-ceadfd8de067e37d52e2af6bb60016cb90342fe8.zip | |
spi: fsl-dspi: Remove possible memory leak of 'chip'
Move the check for spi->bits_per_word
before allocation, to avoid memory leak.
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Bhuvanchandra DV <bhuvanchandra.dv@toradex.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers/spi/spi-fsl-dspi.c')
| -rw-r--r-- | drivers/spi/spi-fsl-dspi.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/drivers/spi/spi-fsl-dspi.c b/drivers/spi/spi-fsl-dspi.c index 2c52c2e185c7..d1a39249704a 100644 --- a/drivers/spi/spi-fsl-dspi.c +++ b/drivers/spi/spi-fsl-dspi.c @@ -347,6 +347,13 @@ static int dspi_setup(struct spi_device *spi) struct fsl_dspi *dspi = spi_master_get_devdata(spi->master); unsigned char br = 0, pbr = 0, fmsz = 0; + if ((spi->bits_per_word >= 4) && (spi->bits_per_word <= 16)) { + fmsz = spi->bits_per_word - 1; + } else { + pr_err("Invalid wordsize\n"); + return -ENODEV; + } + /* Only alloc on first setup */ chip = spi_get_ctldata(spi); if (chip == NULL) { @@ -357,12 +364,6 @@ static int dspi_setup(struct spi_device *spi) chip->mcr_val = SPI_MCR_MASTER | SPI_MCR_PCSIS | SPI_MCR_CLR_TXF | SPI_MCR_CLR_RXF; - if ((spi->bits_per_word >= 4) && (spi->bits_per_word <= 16)) { - fmsz = spi->bits_per_word - 1; - } else { - pr_err("Invalid wordsize\n"); - return -ENODEV; - } chip->void_write_data = 0; |