From: deraadt <deraadt@openbsd.org>
Date: Thu, 22 Jun 2017 02:44:37 +0000 (+0000)
Subject: double ;;.  xhci one found by geoffhill
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=114e9c634453e6153dee5ab180b4513ba598c719;p=openbsd

double ;;.  xhci one found by geoffhill
---

diff --git a/sys/dev/fdt/sximmc.c b/sys/dev/fdt/sximmc.c
index 39d339607ef..008ea70d2b9 100644
--- a/sys/dev/fdt/sximmc.c
+++ b/sys/dev/fdt/sximmc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sximmc.c,v 1.1 2017/01/21 08:26:49 patrick Exp $ */
+/* $OpenBSD: sximmc.c,v 1.2 2017/06/22 02:44:37 deraadt Exp $ */
 /* $NetBSD: awin_mmc.c,v 1.23 2015/11/14 10:32:40 bouyer Exp $ */
 
 /*-
@@ -611,7 +611,7 @@ sximmc_card_detect(sdmmc_chipset_handle_t sch)
 	val = gpio_controller_get_pin(sc->sc_gpio);
 
 	inverted = (OF_getproplen(sc->sc_node, "cd-inverted") == 0);
-	return inverted ? !val : val;;
+	return inverted ? !val : val;
 }
 
 int
diff --git a/sys/dev/pci/if_ix.c b/sys/dev/pci/if_ix.c
index b46163ec37a..339ba2bc4f1 100644
--- a/sys/dev/pci/if_ix.c
+++ b/sys/dev/pci/if_ix.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ix.c,v 1.151 2017/04/24 13:20:46 jsg Exp $	*/
+/*	$OpenBSD: if_ix.c,v 1.152 2017/06/22 02:44:37 deraadt Exp $	*/
 
 /******************************************************************************
 
@@ -3417,7 +3417,7 @@ ixgbe_update_stats_counters(struct ix_softc *sc)
 void
 ixgbe_print_hw_stats(struct ix_softc * sc)
 {
-	struct ifnet   *ifp = &sc->arpcom.ac_if;;
+	struct ifnet   *ifp = &sc->arpcom.ac_if;
 
 	printf("%s: missed pkts %llu, rx len errs %llu, crc errs %llu, "
 	    "dropped pkts %lu, watchdog timeouts %ld, "
diff --git a/sys/dev/usb/if_ure.c b/sys/dev/usb/if_ure.c
index e03cddc72b1..2b5ebd70657 100644
--- a/sys/dev/usb/if_ure.c
+++ b/sys/dev/usb/if_ure.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ure.c,v 1.6 2017/04/18 00:18:51 jmatthew Exp $	*/
+/*	$OpenBSD: if_ure.c,v 1.7 2017/06/22 02:44:37 deraadt Exp $	*/
 /*-
  * Copyright (c) 2015-2016 Kevin Lo <kevlo@FreeBSD.org>
  * All rights reserved.
@@ -978,7 +978,7 @@ ure_init_fifo(struct ure_softc *sc)
 int
 ure_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 {
-	struct ure_softc	*sc = ifp->if_softc;;
+	struct ure_softc	*sc = ifp->if_softc;
 	struct ifreq		*ifr = (struct ifreq *)data;
 	int			s, error = 0;
 
diff --git a/sys/dev/usb/xhci.c b/sys/dev/usb/xhci.c
index c2c23137106..e05023f9153 100644
--- a/sys/dev/usb/xhci.c
+++ b/sys/dev/usb/xhci.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: xhci.c,v 1.72 2017/03/10 11:18:48 mpi Exp $ */
+/* $OpenBSD: xhci.c,v 1.73 2017/06/22 02:44:37 deraadt Exp $ */
 
 /*
  * Copyright (c) 2014-2015 Martin Pieuchot
@@ -225,7 +225,7 @@ usbd_dma_contig_alloc(struct usbd_bus *bus, struct usbd_dma_info *dma,
 	error = bus_dmamap_create(dma->tag, size, 1, size, boundary,
 	    BUS_DMA_NOWAIT, &dma->map);
 	if (error != 0)
-		return (error);;
+		return (error);
 
 	error = bus_dmamem_alloc(dma->tag, size, alignment, boundary, &dma->seg,
 	    1, &dma->nsegs, BUS_DMA_NOWAIT | BUS_DMA_ZERO);