summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2016-10-10 14:41:10 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-02-25 11:03:47 +0100
commit731339363c5ddfd9607610ef9e58d9c0fb46a9f4 (patch)
tree30f918a2e7dcefbdd37eb76428049b474803c34a /drivers
parent6cd38c25bf3f345c0b5402a6a32f37318811613b (diff)
tlan: avoid unused label with PCI=n
commit 1e09c106a44c2b2685a77a1ef27951381c9fcd23 upstream. While build testing with randconfig on x86, I ran into this warning that appears to have been around forever drivers/net/ethernet/ti/tlan.c: In function ‘tlan_probe1’: drivers/net/ethernet/ti/tlan.c:614:1: error: label ‘err_out’ defined but not used [-Werror=unused-label] This can be trivially avoided by just moving the label into the existing #ifdef. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/ethernet/ti/tlan.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/ti/tlan.c b/drivers/net/ethernet/ti/tlan.c
index a274cd49afe9..399a89f30826 100644
--- a/drivers/net/ethernet/ti/tlan.c
+++ b/drivers/net/ethernet/ti/tlan.c
@@ -610,8 +610,8 @@ err_out_regions:
#ifdef CONFIG_PCI
if (pdev)
pci_release_regions(pdev);
-#endif
err_out:
+#endif
if (pdev)
pci_disable_device(pdev);
return rc;