From: miod <miod@openbsd.org>
Date: Tue, 4 Oct 2022 19:38:20 +0000 (+0000)
Subject: Repair Apple-specific translation support broken by mistake in 1.88; reported
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=80ce14bceb26b8e027502ef8e32c7df97a3308f1;p=openbsd

Repair Apple-specific translation support broken by mistake in 1.88; reported
by Leonardo Moreno
---

diff --git a/sys/dev/usb/ukbd.c b/sys/dev/usb/ukbd.c
index 4847b1d95ca..67a21fd3729 100644
--- a/sys/dev/usb/ukbd.c
+++ b/sys/dev/usb/ukbd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ukbd.c,v 1.87 2022/09/16 16:30:10 robert Exp $	*/
+/*	$OpenBSD: ukbd.c,v 1.88 2022/10/04 19:38:20 miod Exp $	*/
 /*      $NetBSD: ukbd.c,v 1.85 2003/03/11 16:44:00 augustss Exp $        */
 
 /*
@@ -131,7 +131,6 @@ struct ukbd_softc {
 
 	struct hidkbd		sc_kbd;
 	int			sc_spl;
-	struct hid_location	sc_apple_fn;
 
 #ifdef DDB
 	struct timeout		sc_ddb;	/* for entering DDB */
@@ -242,7 +241,7 @@ ukbd_attach(struct device *parent, struct device *self, void *aux)
 
 	if (uha->uaa->vendor == USB_VENDOR_APPLE) {
 		if (hid_locate(desc, dlen, HID_USAGE2(HUP_APPLE, HUG_FN_KEY),
-		    uha->reportid, hid_input, &sc->sc_apple_fn, &qflags)) {
+		    uha->reportid, hid_input, &kbd->sc_fn, &qflags)) {
 			if (qflags & HIO_VARIABLE) {
 				switch (uha->uaa->product) {
 				case USB_PRODUCT_APPLE_FOUNTAIN_ISO: