]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
5.4-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 16 Nov 2020 08:43:47 +0000 (09:43 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 16 Nov 2020 08:43:47 +0000 (09:43 +0100)
added patches:
spi-bcm2835-remove-use-of-uninitialized-gpio-flags-variable.patch

queue-5.4/series
queue-5.4/spi-bcm2835-remove-use-of-uninitialized-gpio-flags-variable.patch [new file with mode: 0644]

index cdd31c5b06f94b6cce93ca4189d026082f84a9d6..de30359ddc9001a5f89fabba8efae21f4354daac 100644 (file)
@@ -81,3 +81,4 @@ selftests-proc-fix-warning-_gnu_source-redefined.patch
 riscv-set-text_offset-correctly-for-m-mode.patch
 i2c-sh_mobile-implement-atomic-transfers.patch
 tpm_tis-disable-interrupts-on-thinkpad-t490s.patch
+spi-bcm2835-remove-use-of-uninitialized-gpio-flags-variable.patch
diff --git a/queue-5.4/spi-bcm2835-remove-use-of-uninitialized-gpio-flags-variable.patch b/queue-5.4/spi-bcm2835-remove-use-of-uninitialized-gpio-flags-variable.patch
new file mode 100644 (file)
index 0000000..c7ddbad
--- /dev/null
@@ -0,0 +1,47 @@
+From bc7f2cd7559c5595dc38b909ae9a8d43e0215994 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Martin=20Hundeb=C3=B8ll?= <martin@geanix.com>
+Date: Thu, 5 Nov 2020 10:06:15 +0100
+Subject: spi: bcm2835: remove use of uninitialized gpio flags variable
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+From: Martin Hundebøll <martin@geanix.com>
+
+commit bc7f2cd7559c5595dc38b909ae9a8d43e0215994 upstream.
+
+Removing the duplicate gpio chip select level handling in
+bcm2835_spi_setup() left the lflags variable uninitialized. Avoid trhe
+use of such variable by passing default flags to
+gpiochip_request_own_desc().
+
+Fixes: 5e31ba0c0543 ("spi: bcm2835: fix gpio cs level inversion")
+Signed-off-by: Martin Hundebøll <martin@geanix.com>
+Link: https://lore.kernel.org/r/20201105090615.620315-1-martin@geanix.com
+Signed-off-by: Mark Brown <broonie@kernel.org>
+Cc: Nathan Chancellor <natechancellor@gmail.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/spi/spi-bcm2835.c |    3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+--- a/drivers/spi/spi-bcm2835.c
++++ b/drivers/spi/spi-bcm2835.c
+@@ -1179,7 +1179,6 @@ static int bcm2835_spi_setup(struct 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;
+       /*
+@@ -1247,7 +1246,7 @@ static int bcm2835_spi_setup(struct 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);