From: Stefan Wahren Date: Wed, 26 Oct 2016 18:34:18 +0000 (+0000) Subject: staging: vchiq_arm: Make DT firmware node mandatory X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=bea845af8d877310bbbacd54e8252566019d5a5e;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git staging: vchiq_arm: Make DT firmware node mandatory In Linux Mainline there wasn't a chance to boot the RPi without DT. So we can make the firmware node mandatory. Signed-off-by: Stefan Wahren Reviewed-by: Eric Anholt Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c index 119ca145dbc4..ce3ba37fbeb0 100644 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c @@ -2794,12 +2794,11 @@ static int vchiq_probe(struct platform_device *pdev) void *ptr_err; fw_node = of_parse_phandle(pdev->dev.of_node, "firmware", 0); -/* Remove comment when booting without Device Tree is no longer supported if (!fw_node) { dev_err(&pdev->dev, "Missing firmware node\n"); return -ENOENT; } -*/ + fw = rpi_firmware_get(fw_node); if (!fw) return -EPROBE_DEFER;