Openwrt/target/linux/bcm27xx/patches-5.4/950-0788-Revert-SQUASH-Fix-spi-driver-compiler-warnings.patch
John Audia d8dc9f108a kernel: bump 5.4 to 5.4.126
Manually rebased:
  bcm27xx/patches-5.4/950-0089-cgroup-Disable-cgroup-memory-by-default.patch

All other patches automatically rebased.

Signed-off-by: John Audia <graysky@archlinux.us>
2021-06-26 12:49:15 +02:00

24 lines
764 B
Diff

From 34072d0778e21edf69455d900b8a16be6b9ac95c Mon Sep 17 00:00:00 2001
From: Phil Elwell <phil@raspberrypi.com>
Date: Tue, 16 Jun 2020 10:23:03 +0100
Subject: [PATCH] Revert "SQUASH: Fix spi driver compiler warnings"
This reverts commit fe3f696b7e5229678ae45d1293e97b5ecc00c245.
See: https://github.com/raspberrypi/linux/pull/3687
---
drivers/spi/spi-bcm2835.c | 2 ++
1 file changed, 2 insertions(+)
--- a/drivers/spi/spi-bcm2835.c
+++ b/drivers/spi/spi-bcm2835.c
@@ -1182,6 +1182,8 @@ 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;
if (spi->chip_select >= BCM2835_SPI_NUM_CS) {