summaryrefslogtreecommitdiff
path: root/drivers/net/appletalk/cops.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-08-31 07:17:17 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-08-31 07:17:17 +0200
commitdd5597245d35cfbb0890b8a868028aa1d2018701 (patch)
tree865b93bf83987840fd763bf8a3d1c615ccda2f7b /drivers/net/appletalk/cops.c
parent551b6729578a8981c46af964c10bf7d5d9ddca83 (diff)
parentf75aef392f869018f78cfedf3c320a6b3fcfda6b (diff)
Merge 5.9-rc3 into char-misc-next
We need the fixes in here as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/net/appletalk/cops.c')
-rw-r--r--drivers/net/appletalk/cops.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/appletalk/cops.c b/drivers/net/appletalk/cops.c
index 18428e104445..1c6c27f35ac4 100644
--- a/drivers/net/appletalk/cops.c
+++ b/drivers/net/appletalk/cops.c
@@ -301,7 +301,7 @@ static int __init cops_probe1(struct net_device *dev, int ioaddr)
dev->irq = cops_irq(ioaddr, board);
if (dev->irq)
break;
- /* fall through - Once no IRQ found on this port. */
+ fallthrough; /* Once no IRQ found on this port */
case 1:
retval = -EINVAL;
goto err_out;