mirror of
https://github.com/openwrt/openwrt.git
synced 2025-01-14 00:40:12 +00:00
e0bdf83972
Merged upstream: apm821xx/patches-5.4/150-ata-sata_dwc_460ex-Fix-crash-due-to-OOB-write.patch Similar patch merged upstream: bcm27xx/patches-5.4/950-0210-usb-xhci-Disable-the-XHCI-5-second-timeout.patch Manually adapted: layerscape/patches-5.4/801-audio-0008-Revert-ASoC-Remove-dev_err-usage-after-platform_get_.patch Compile-tested: armvirt/64 Run-tested: armvirt/64 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
31 lines
1.1 KiB
Diff
31 lines
1.1 KiB
Diff
From 4e4637b10374ede3cd33d7e1b389e6cea6343ea3 Mon Sep 17 00:00:00 2001
|
|
From: Colin Ian King <colin.king@canonical.com>
|
|
Date: Tue, 12 Nov 2019 13:05:23 +0000
|
|
Subject: [PATCH] net: dsa: mv88e6xxx: fix broken if statement because of a
|
|
stray semicolon
|
|
|
|
There is a stray semicolon in an if statement that will cause a dev_err
|
|
message to be printed unconditionally. Fix this by removing the stray
|
|
semicolon.
|
|
|
|
Addresses-Coverity: ("Stay semicolon")
|
|
Fixes: f0942e00a1ab ("net: dsa: mv88e6xxx: Add support for port mirroring")
|
|
Signed-off-by: Colin Ian King <colin.king@canonical.com>
|
|
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
|
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
---
|
|
drivers/net/dsa/mv88e6xxx/chip.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
--- a/drivers/net/dsa/mv88e6xxx/chip.c
|
|
+++ b/drivers/net/dsa/mv88e6xxx/chip.c
|
|
@@ -4994,7 +4994,7 @@ static void mv88e6xxx_port_mirror_del(st
|
|
if (chip->info->ops->set_egress_port(chip,
|
|
direction,
|
|
dsa_upstream_port(ds,
|
|
- port)));
|
|
+ port)))
|
|
dev_err(ds->dev, "failed to set egress port\n");
|
|
}
|
|
|