Module Name: src
Committed By: riastradh
Date: Wed May 10 00:12:36 UTC 2023
Modified Files:
src/sys/dev/usb: udsbr.c
Log Message:
udsbr(4): Use config_detach_children.
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/sys/dev/usb/udsbr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/udsbr.c
diff -u src/sys/dev/usb/udsbr.c:1.31 src/sys/dev/usb/udsbr.c:1.32
--- src/sys/dev/usb/udsbr.c:1.31 Sat Mar 14 02:35:33 2020
+++ src/sys/dev/usb/udsbr.c Wed May 10 00:12:36 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: udsbr.c,v 1.31 2020/03/14 02:35:33 christos Exp $ */
+/* $NetBSD: udsbr.c,v 1.32 2023/05/10 00:12:36 riastradh Exp $ */
/*
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: udsbr.c,v 1.31 2020/03/14 02:35:33 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: udsbr.c,v 1.32 2023/05/10 00:12:36 riastradh Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -170,15 +170,17 @@ static int
udsbr_detach(device_t self, int flags)
{
struct udsbr_softc *sc = device_private(self);
- int rv = 0;
+ int error;
+
+ error = config_detach_children(self, flags);
+ if (error)
+ return error;
- if (sc->sc_child != NULL)
- rv = config_detach(sc->sc_child, flags);
if (sc->sc_udev != NULL)
usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev,
sc->sc_dev);
- return rv;
+ return 0;
}
static int
