Author: wulf
Date: Sun Apr 26 19:42:40 2020
New Revision: 360351
URL: https://svnweb.freebsd.org/changeset/base/360351

Log:
  MFC r359905:
  
  [evdev] Use proper mutex reference in autorepeat callout initialization.
  
  This fixes panic occuring when evdev key autorepeat is enabled by driver
  which initializes evdev with external mutex.

Modified:
  stable/12/sys/dev/evdev/evdev.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/dev/evdev/evdev.c
==============================================================================
--- stable/12/sys/dev/evdev/evdev.c     Sun Apr 26 19:17:45 2020        
(r360350)
+++ stable/12/sys/dev/evdev/evdev.c     Sun Apr 26 19:42:40 2020        
(r360351)
@@ -293,7 +293,7 @@ evdev_register_common(struct evdev_dev *evdev)
        if (evdev_event_supported(evdev, EV_REP) &&
            bit_test(evdev->ev_flags, EVDEV_FLAG_SOFTREPEAT)) {
                /* Initialize callout */
-               callout_init_mtx(&evdev->ev_rep_callout, &evdev->ev_mtx, 0);
+               callout_init_mtx(&evdev->ev_rep_callout, evdev->ev_lock, 0);
 
                if (evdev->ev_rep[REP_DELAY] == 0 &&
                    evdev->ev_rep[REP_PERIOD] == 0) {
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"

Reply via email to