microsoft
/
WSL2-Linux-Kernel
зеркало из https://github.com/microsoft/WSL2-Linux-Kernel.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

spi: Fix for v5.10 

This is an additional fix on top of 5e31ba0c05 (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.
 -----BEGIN PGP SIGNATURE-----
 
 iQEzBAABCgAdFiEEreZoqmdXGLWf4p/qJNaLcl1Uh9AFAl+le2UACgkQJNaLcl1U
 h9DLWwf+INKJQ2Q8e7sm4u+ckiRUzeTamHb+8cgkeHfTRdwfeiDHUTZ8DHXGv+wf
 Wgo6Y/6/z3JDvUD3q+EunYJixRoDA2iE40HTMt/DjludwzNAr9vWcMakoSB54Gf3
 F4OjS8IvY67piknTTnkLBDR71qTIJGghS/t5DhI3kvsV6ecJ/cqi8f9ZmZd8CAfC
 LSBpVO7G2A5BLL8Mw3a/8LFVExIouEjAbKivzzWA7TbCrvoB9IO1BTr38hYmZiM9
 S8tOpViXotgIWm80PjHIb6FYCvi/KgBLirgd/wIeo+5jTiVSdnRWgbsazdaFgI7p
 grS+UWudcWjP2YgeTzPp+0TT24pRuQ==
 =Svbj
 -----END PGP SIGNATURE-----

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 5e31ba0c05 ('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
This commit is contained in:
Linus Torvalds 2020-11-06 13:05:21 -08:00
Родитель bb72bbe8f6 bc7f2cd755
Коммит 44d8062185
1 изменённых файлов: 1 добавлений и 2 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

3
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 spi_controller *ctlr = spi->controller;
struct bcm2835_spi *bs = spi_controller_get_devdata(ctlr); struct bcm2835_spi *bs = spi_controller_get_devdata(ctlr);
struct gpio_chip *chip; struct gpio_chip *chip;
enum gpio_lookup_flags lflags;
u32 cs; 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, spi->cs_gpiod = gpiochip_request_own_desc(chip, 8 - spi->chip_select,
DRV_NAME, DRV_NAME,
lflags, GPIO_LOOKUP_FLAGS_DEFAULT,
GPIOD_OUT_LOW); GPIOD_OUT_LOW);
if (IS_ERR(spi->cs_gpiod)) if (IS_ERR(spi->cs_gpiod))
return PTR_ERR(spi->cs_gpiod); return PTR_ERR(spi->cs_gpiod);