summaryrefslogtreecommitdiffstats
path: root/sys/dev/usb/if_url.c
diff options
context:
space:
mode:
authorjakemsr <jakemsr@openbsd.org>2010-10-23 16:14:06 +0000
committerjakemsr <jakemsr@openbsd.org>2010-10-23 16:14:06 +0000
commitc7438bdd78c4b7327ff5d3bff7386fef96a2edcd (patch)
treec00fedacf2d1eba777061f314d9e850960c3a3e3 /sys/dev/usb/if_url.c
parent.Sm no longer produces a linebreak when used in .Bd (diff)
downloadwireguard-openbsd-c7438bdd78c4b7327ff5d3bff7386fef96a2edcd.tar.xz
wireguard-openbsd-c7438bdd78c4b7327ff5d3bff7386fef96a2edcd.zip
check that a timeout(9) has been initialized before deleting it
ok phessler
Diffstat (limited to 'sys/dev/usb/if_url.c')
-rw-r--r--sys/dev/usb/if_url.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/dev/usb/if_url.c b/sys/dev/usb/if_url.c
index 42fe68d4111..c0b67dc261d 100644
--- a/sys/dev/usb/if_url.c
+++ b/sys/dev/usb/if_url.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_url.c,v 1.57 2010/10/23 15:42:09 jakemsr Exp $ */
+/* $OpenBSD: if_url.c,v 1.58 2010/10/23 16:14:07 jakemsr Exp $ */
/* $NetBSD: if_url.c,v 1.6 2002/09/29 10:19:21 martin Exp $ */
/*
* Copyright (c) 2001, 2002
@@ -339,7 +339,8 @@ url_detach(struct device *self, int flags)
if (!sc->sc_attached)
return (0);
- timeout_del(&sc->sc_stat_ch);
+ if (timeout_initialized(&sc->sc_stat_ch))
+ timeout_del(&sc->sc_stat_ch);
/* Remove any pending tasks */
usb_rem_task(sc->sc_udev, &sc->sc_tick_task);