summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorn_hibma <n_hibma@FreeBSD.org>1999-08-28 11:35:36 +0000
committern_hibma <n_hibma@FreeBSD.org>1999-08-28 11:35:36 +0000
commitb6f921b6b3d6ee4af6f058398bc105a3c7cf751f (patch)
tree15a86c57a24cfbaf1e1b874160c8e72a1d1d2df5
parent8422690eaa75b9c970d104077d6ce63f8b963e19 (diff)
downloadFreeBSD-src-b6f921b6b3d6ee4af6f058398bc105a3c7cf751f.zip
FreeBSD-src-b6f921b6b3d6ee4af6f058398bc105a3c7cf751f.tar.gz
We use device_set_desc_copy, so we do not need to free the copied text
manually.
-rw-r--r--sys/dev/usb/ugen.c2
-rw-r--r--sys/dev/usb/uhid.c2
-rw-r--r--sys/dev/usb/ukbd.c2
-rw-r--r--sys/dev/usb/ulpt.c2
-rw-r--r--sys/dev/usb/umodem.c1
-rw-r--r--sys/dev/usb/ums.c2
6 files changed, 4 insertions, 7 deletions
diff --git a/sys/dev/usb/ugen.c b/sys/dev/usb/ugen.c
index f217f03..0772eb8 100644
--- a/sys/dev/usb/ugen.c
+++ b/sys/dev/usb/ugen.c
@@ -1013,7 +1013,7 @@ static int
ugen_detach(device_t self)
{
DPRINTF(("%s: disconnected\n", USBDEVNAME(self)));
- device_set_desc(self, NULL);
+
return 0;
}
diff --git a/sys/dev/usb/uhid.c b/sys/dev/usb/uhid.c
index f091594..06d8485 100644
--- a/sys/dev/usb/uhid.c
+++ b/sys/dev/usb/uhid.c
@@ -240,7 +240,7 @@ static int
uhid_detach(device_t self)
{
DPRINTF(("%s: disconnected\n", USBDEVNAME(self)));
- device_set_desc(self, NULL);
+
return 0;
}
#endif
diff --git a/sys/dev/usb/ukbd.c b/sys/dev/usb/ukbd.c
index 67b0f26..e622a88 100644
--- a/sys/dev/usb/ukbd.c
+++ b/sys/dev/usb/ukbd.c
@@ -206,8 +206,6 @@ ukbd_detach(device_t self)
DPRINTF(("%s: disconnected\n", USBDEVNAME(self)));
- device_set_desc(self, NULL);
-
return (0);
}
diff --git a/sys/dev/usb/ulpt.c b/sys/dev/usb/ulpt.c
index 8a0005a..6f178dd 100644
--- a/sys/dev/usb/ulpt.c
+++ b/sys/dev/usb/ulpt.c
@@ -449,7 +449,7 @@ static int
ulpt_detach(device_t self)
{
DPRINTF(("%s: disconnected\n", USBDEVNAME(self)));
- device_set_desc(self, NULL);
+
return 0;
}
diff --git a/sys/dev/usb/umodem.c b/sys/dev/usb/umodem.c
index c624b86..8041214 100644
--- a/sys/dev/usb/umodem.c
+++ b/sys/dev/usb/umodem.c
@@ -126,7 +126,6 @@ static int
umodem_detach(device_t self)
{
DPRINTF(("%s: disconnected\n", USBDEVNAME(self)));
- device_set_desc(self, NULL);
return 0;
}
diff --git a/sys/dev/usb/ums.c b/sys/dev/usb/ums.c
index cb1bb8a..4e8e441 100644
--- a/sys/dev/usb/ums.c
+++ b/sys/dev/usb/ums.c
@@ -388,7 +388,7 @@ ums_detach(device_t self)
sc->sc_disconnected = 1;
DPRINTF(("%s: disconnected\n", USBDEVNAME(self)));
- device_set_desc(self, NULL);
+
free(sc->sc_loc_btn, M_USB);
free(sc->sc_ibuf, M_USB);
OpenPOWER on IntegriCloud