diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2020-11-06 13:05:21 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-11-06 13:05:21 -0800 |
| commit | 44d80621857f916f1370782cdd20c9359ccc5eea (patch) | |
| tree | 4ece51fc64eaca1b4138ef22877447a336202183 /drivers | |
| parent | Merge tag 'sound-5.10-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound (diff) | |
| parent | spi: bcm2835: remove use of uninitialized gpio flags variable (diff) | |
| download | linux-dev-44d80621857f916f1370782cdd20c9359ccc5eea.tar.xz linux-dev-44d80621857f916f1370782cdd20c9359ccc5eea.zip | |
Merge tag 'spi-fix-v5.10-rc2-2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi
Pull spi fix from Mark Brown:
"This is an additional fix on top of 5e31ba0c0543 ('spi: bcm2835: fix
gpio cs level inversion') - when sending my prior pull request I had
misremembred the status of that patch, apologies for the noise here"
* tag 'spi-fix-v5.10-rc2-2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi:
spi: bcm2835: remove use of uninitialized gpio flags variable
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/spi/spi-bcm2835.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/spi/spi-bcm2835.c b/drivers/spi/spi-bcm2835.c index 9b6ba94fe878..7104cf17b848 100644 --- a/drivers/spi/spi-bcm2835.c +++ b/drivers/spi/spi-bcm2835.c @@ -1193,7 +1193,6 @@ static int bcm2835_spi_setup(struct spi_device *spi) struct spi_controller *ctlr = spi->controller; struct bcm2835_spi *bs = spi_controller_get_devdata(ctlr); struct gpio_chip *chip; - enum gpio_lookup_flags lflags; u32 cs; /* @@ -1261,7 +1260,7 @@ static int bcm2835_spi_setup(struct spi_device *spi) spi->cs_gpiod = gpiochip_request_own_desc(chip, 8 - spi->chip_select, DRV_NAME, - lflags, + GPIO_LOOKUP_FLAGS_DEFAULT, GPIOD_OUT_LOW); if (IS_ERR(spi->cs_gpiod)) return PTR_ERR(spi->cs_gpiod); |