summaryrefslogtreecommitdiffstats
path: root/sys/dev/usb
diff options
context:
space:
mode:
authorhselasky <hselasky@FreeBSD.org>2010-11-30 08:25:57 +0000
committerhselasky <hselasky@FreeBSD.org>2010-11-30 08:25:57 +0000
commit62e7eb3b2cc741ac41ed04e66f9b613f48d4a762 (patch)
tree93e4da8d8fe9a83967c5e95cb2e0b40b695e52dd /sys/dev/usb
parent03e47472e4b5d434e97d43f2366acf7e069ecd8f (diff)
downloadFreeBSD-src-62e7eb3b2cc741ac41ed04e66f9b613f48d4a762.zip
FreeBSD-src-62e7eb3b2cc741ac41ed04e66f9b613f48d4a762.tar.gz
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)
Diffstat (limited to 'sys/dev/usb')
-rw-r--r--sys/dev/usb/usb_device.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/sys/dev/usb/usb_device.c b/sys/dev/usb/usb_device.c
index 95b0e9e..dcf1a4a 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),
OpenPOWER on IntegriCloud