From 02c4024199717e781e9cf5bca9e739fae563eca0 Mon Sep 17 00:00:00 2001 From: Hans Petter Selasky Date: Tue, 30 Nov 2010 08:25:57 +0000 Subject: [PATCH] We need to define a cdev variable associated with each USB device, hence existing applications like webcamd are expecting that. This problem was introduced by SVN change 214221 where cdev= was replaced by ugen= by accident. Solve this problem by redefining cdev= in devd notifications. MFC after 3 days. Approved by: thompsa (mentor) --- sys/dev/usb/usb_device.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/dev/usb/usb_device.c b/sys/dev/usb/usb_device.c index 95b0e9e0ff7..dcf1a4a1be2 100644 --- a/sys/dev/usb/usb_device.c +++ b/sys/dev/usb/usb_device.c @@ -2475,6 +2475,7 @@ usb_notify_addq(const char *type, struct usb_device *udev) sbuf_printf(sb, #if USB_HAVE_UGEN "ugen=%s " + "cdev=%s " #endif "vendor=0x%04x " "product=0x%04x " @@ -2490,6 +2491,7 @@ usb_notify_addq(const char *type, struct usb_device *udev) "", #if USB_HAVE_UGEN udev->ugen_name, + udev->ugen_name, #endif UGETW(udev->ddesc.idVendor), UGETW(udev->ddesc.idProduct), @@ -2521,6 +2523,7 @@ usb_notify_addq(const char *type, struct usb_device *udev) sbuf_printf(sb, #if USB_HAVE_UGEN "ugen=%s " + "cdev=%s " #endif "vendor=0x%04x " "product=0x%04x " @@ -2536,6 +2539,7 @@ usb_notify_addq(const char *type, struct usb_device *udev) "intprotocol=0x%02x", #if USB_HAVE_UGEN udev->ugen_name, + udev->ugen_name, #endif UGETW(udev->ddesc.idVendor), UGETW(udev->ddesc.idProduct), -- 2.45.2