diff options
author | Dan McDonald <danmcd@joyent.com> | 2022-02-09 18:32:59 -0500 |
---|---|---|
committer | Dan McDonald <danmcd@joyent.com> | 2022-02-09 18:32:59 -0500 |
commit | 069d372e51ed082937f2ae1e3fc6022af253b87d (patch) | |
tree | 63cf8b1a00367f5a0d505c5e4e567e2f5a3754b3 /usr/src/uts/common/io/usb | |
parent | 3ab482828d080ea445f7748fbc3acc726f638c8e (diff) | |
parent | 27c57c46550d6ff25e4454b21d73ca9e29f12d74 (diff) | |
download | illumos-joyent-release-20220210.tar.gz |
[illumos-gate merge]release-20220210
commit 27c57c46550d6ff25e4454b21d73ca9e29f12d74
14490 ucodeadm cannot handle latest Intel microcode (again)
commit cfe80fe3616624773746461f58f667b0c4141275
14464 want ugen nodes for devices attached by hid
Conflicts:
usr/src/uts/common/io/usb/clients/hid/hid.c
Diffstat (limited to 'usr/src/uts/common/io/usb')
-rw-r--r-- | usr/src/uts/common/io/usb/clients/hid/hid.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/usr/src/uts/common/io/usb/clients/hid/hid.c b/usr/src/uts/common/io/usb/clients/hid/hid.c index eccd48bf08..31a0aad206 100644 --- a/usr/src/uts/common/io/usb/clients/hid/hid.c +++ b/usr/src/uts/common/io/usb/clients/hid/hid.c @@ -355,7 +355,7 @@ hid_attach(dev_info_t *dip, ddi_attach_cmd_t cmd) usb_alt_if_data_t *altif_data; char minor_name[HID_MINOR_NAME_LEN]; usb_ep_data_t *ep_data; - usb_ugen_info_t usb_ugen_info; + usb_ugen_info_t usb_ugen_info; switch (cmd) { case DDI_ATTACH: |