summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormmcc <mmcc@openbsd.org>2015-12-24 16:21:11 +0000
committermmcc <mmcc@openbsd.org>2015-12-24 16:21:11 +0000
commit4905c97fbe1f51edbc35d9d3b540dab8cd5c5620 (patch)
tree85b6d2b8e98937ffcdd1538a3ba92ae1b5675c71
parentKNF cleanup: sort #includes and cases in switch statements. (diff)
downloadwireguard-openbsd-4905c97fbe1f51edbc35d9d3b540dab8cd5c5620.tar.xz
wireguard-openbsd-4905c97fbe1f51edbc35d9d3b540dab8cd5c5620.zip
Remove a couple NULL-checks before free().
ok sf@
-rw-r--r--sys/dev/pci/viocon.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/sys/dev/pci/viocon.c b/sys/dev/pci/viocon.c
index cb8a3228a24..1a08847e1ed 100644
--- a/sys/dev/pci/viocon.c
+++ b/sys/dev/pci/viocon.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: viocon.c,v 1.1 2015/12/21 22:15:53 sf Exp $ */
+/* $OpenBSD: viocon.c,v 1.2 2015/12/24 16:21:11 mmcc Exp $ */
/*
* Copyright (c) 2013-2015 Stefan Fritsch <sf@sfritsch.de>
@@ -206,10 +206,8 @@ viocon_attach(struct device *parent, struct device *self, void *aux)
return;
err:
vsc->sc_child = VIRTIO_CHILD_ERROR;
- if (vsc->sc_vqs)
- free(vsc->sc_vqs, M_DEVBUF, 2 * (maxports + 1) * sizeof(struct virtqueue));
- if (sc->sc_ports)
- free(sc->sc_ports, M_DEVBUF, maxports * sizeof(sc->sc_ports[0]));
+ free(vsc->sc_vqs, M_DEVBUF, 2 * (maxports + 1) * sizeof(struct virtqueue));
+ free(sc->sc_ports, M_DEVBUF, maxports * sizeof(sc->sc_ports[0]));
}
int