summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorthompsa <thompsa@FreeBSD.org>2010-04-06 23:30:57 +0000
committerthompsa <thompsa@FreeBSD.org>2010-04-06 23:30:57 +0000
commit5c446ec5324e2f6d2d32220a2148272fde88a7c3 (patch)
tree9f264b171ea97c70c207439f5dc13db1503f67c7
parentb98a28f6626281138e289258cc8687913ecb0186 (diff)
downloadFreeBSD-src-5c446ec5324e2f6d2d32220a2148272fde88a7c3.zip
FreeBSD-src-5c446ec5324e2f6d2d32220a2148272fde88a7c3.tar.gz
MFC r205804
Do not swap Apple keys when detecting Apple-FN keyboards. Reported by: Steven Noonan Submitted by: Hans Petter Selasky
-rw-r--r--sys/dev/usb/input/ukbd.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/sys/dev/usb/input/ukbd.c b/sys/dev/usb/input/ukbd.c
index 2253904..47c6f88 100644
--- a/sys/dev/usb/input/ukbd.c
+++ b/sys/dev/usb/input/ukbd.c
@@ -903,8 +903,7 @@ ukbd_attach(device_t dev)
hid_input, 0, &sc->sc_loc_apple_fn, &flags,
&temp_id)) {
if (flags & HIO_VARIABLE)
- sc->sc_flags |= UKBD_FLAG_APPLE_FN |
- UKBD_FLAG_APPLE_SWAP;
+ sc->sc_flags |= UKBD_FLAG_APPLE_FN;
DPRINTFN(1, "Found Apple FN-key\n");
apple_keys = 1;
sc->sc_kbd_id = temp_id;
OpenPOWER on IntegriCloud