0ec06ca246ef7db6e39cd504bccd85250dac1b1d
[oweals/openwrt.git] / target / linux / brcm2708 / patches-4.19 / 950-0272-char-vcio-Fail-probe-if-rpi_firmware-is-not-found.patch
1 From 6880e5c73b75be683299debf391eba4f521cc20f Mon Sep 17 00:00:00 2001
2 From: Dave Stevenson <dave.stevenson@raspberrypi.org>
3 Date: Thu, 24 Jan 2019 14:03:28 +0000
4 Subject: [PATCH] char: vcio: Fail probe if rpi_firmware is not found.
5
6 Device Tree is now the only supported config mechanism, therefore
7 uncomment the block of code that fails the probe if the
8 firmware node can't be found.
9
10 Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
11 ---
12  drivers/char/broadcom/vcio.c | 3 +--
13  1 file changed, 1 insertion(+), 2 deletions(-)
14
15 --- a/drivers/char/broadcom/vcio.c
16 +++ b/drivers/char/broadcom/vcio.c
17 @@ -126,10 +126,9 @@ static int __init vcio_init(void)
18  
19         np = of_find_compatible_node(NULL, NULL,
20                                      "raspberrypi,bcm2835-firmware");
21 -/* Uncomment this when we only boot with Device Tree
22         if (!of_device_is_available(np))
23                 return -ENODEV;
24 -*/
25 +
26         vcio.fw = rpi_firmware_get(np);
27         if (!vcio.fw)
28                 return -ENODEV;