diff options
| author |   mpi <mpi@openbsd.org> | 2015-12-20 10:08:05 +0000 |
|---|---|---|
| committer | mpi <mpi@openbsd.org> | 2015-12-20 10:08:05 +0000 |
| commit | 7097c97c882000e39d87fa83aa537e017f6eb296 (patch) | |
| tree | 48774743618d57df46e39b7d4ce8dabd91a8d346 /sys/dev/usb/uvideo.c | |
| parent | Simple free(9) sizes, from Matthieu <naabed AT poolp DOT org>. (diff) | |
| download | wireguard-openbsd-7097c97c882000e39d87fa83aa537e017f6eb296.tar.xz wireguard-openbsd-7097c97c882000e39d87fa83aa537e017f6eb296.zip | |
Do not delay video(4) attachment if the device does not need to load
a firmware.
Regression spotted by deraadt@
Diffstat (limited to 'sys/dev/usb/uvideo.c')
| -rw-r--r-- | sys/dev/usb/uvideo.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sys/dev/usb/uvideo.c b/sys/dev/usb/uvideo.c index 67077e9586c..69576a1c1e9 100644 --- a/sys/dev/usb/uvideo.c +++ b/sys/dev/usb/uvideo.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uvideo.c,v 1.182 2015/12/11 16:07:02 mpi Exp $ */ +/* $OpenBSD: uvideo.c,v 1.183 2015/12/20 10:08:05 mpi Exp $ */ /* * Copyright (c) 2008 Robert Nagy <robert@openbsd.org> @@ -526,7 +526,10 @@ uvideo_attach(struct device *parent, struct device *self, void *aux) /* maybe the device has quirks */ sc->sc_quirk = uvideo_lookup(uaa->vendor, uaa->product); - config_mountroot(self, uvideo_attach_hook); + if (sc->sc_quirk && sc->sc_quirk->ucode_name) + config_mountroot(self, uvideo_attach_hook); + else + uvideo_attach_hook(self); } void |