diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-01-26 11:03:30 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-01-26 11:03:30 -0800 |
| commit | c7230a48ed5ebdda54867816303e974c154841d1 (patch) | |
| tree | 3c89e2e440723c7e484a6cb135c0e247b0310589 /drivers/spi/spi-altera.c | |
| parent | 5bec2487ff3361d96a96b74fceaf39ca54866adb (diff) | |
| parent | 396cf2a46adddbf51373e16225c1d25254310046 (diff) | |
| download | linux-c7230a48ed5ebdda54867816303e974c154841d1.tar.bz2 | |
Merge tag 'spi-fix-v5.11-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi
Pull spi fixes from Mark Brown:
"One new device ID here, plus an error handling fix - nothing
remarkable in either"
* tag 'spi-fix-v5.11-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi:
spidev: Add cisco device compatible
spi: altera: Fix memory leak on error path
Diffstat (limited to 'drivers/spi/spi-altera.c')
| -rw-r--r-- | drivers/spi/spi-altera.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/spi/spi-altera.c b/drivers/spi/spi-altera.c index cbc4c28c1541..62ea0c9e321b 100644 --- a/drivers/spi/spi-altera.c +++ b/drivers/spi/spi-altera.c @@ -254,7 +254,8 @@ static int altera_spi_probe(struct platform_device *pdev) dev_err(&pdev->dev, "Invalid number of chipselect: %hu\n", pdata->num_chipselect); - return -EINVAL; + err = -EINVAL; + goto exit; } master->num_chipselect = pdata->num_chipselect; |