mirror of
https://github.com/openwrt/openwrt.git
synced 2025-01-13 00:10:21 +00:00
e44e60b290
Resolved merge conflict in the following patches: layerscape: 701-net-0213-dpaa2-eth-Add-CEETM-qdisc-support.patch ramips: 0013-owrt-hack-fix-mt7688-cache-issue.patch Refreshed patches, removed upstreamed patch: bcm63xx: 020-v5.8-mtd-rawnand-brcmnand-fix-hamming-oob-layout.patch Run tested: qemu-x86-64 Build tested: x86/64 Signed-off-by: Petr Štetiar <ynezz@true.cz>
25 lines
938 B
Diff
25 lines
938 B
Diff
From 92f17eecf263f3705a6e1a4f27ecb273ed3a33e5 Mon Sep 17 00:00:00 2001
|
|
From: Phil Elwell <phil@raspberrypi.org>
|
|
Date: Thu, 14 Nov 2019 12:00:43 +0000
|
|
Subject: [PATCH] drm/v3d: The third IRQ is optional
|
|
|
|
As of 5.4, the kernel logs errors for absent IRQs unless requested
|
|
with platform_get_irq_optional.
|
|
|
|
Signed-off-by: Phil Elwell <phil@raspberrypi.org>
|
|
---
|
|
drivers/net/ethernet/broadcom/genet/bcmgenet.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
--- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c
|
|
+++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
|
|
@@ -3476,7 +3476,7 @@ static int bcmgenet_probe(struct platfor
|
|
priv = netdev_priv(dev);
|
|
priv->irq0 = platform_get_irq(pdev, 0);
|
|
priv->irq1 = platform_get_irq(pdev, 1);
|
|
- priv->wol_irq = platform_get_irq(pdev, 2);
|
|
+ priv->wol_irq = platform_get_irq_optional(pdev, 2);
|
|
if (!priv->irq0 || !priv->irq1) {
|
|
dev_err(&pdev->dev, "can't find IRQs\n");
|
|
err = -EINVAL;
|