Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/dev/pci Fix LOCKDEBUG panic on detach.



details:   https://anonhg.NetBSD.org/src/rev/d395f9a25020
branches:  trunk
changeset: 847092:d395f9a25020
user:      ad <ad%NetBSD.org@localhost>
date:      Mon Dec 09 21:00:48 2019 +0000

description:
Fix LOCKDEBUG panic on detach.

diffstat:

 sys/dev/pci/ichsmb.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (34 lines):

diff -r 41052342652e -r d395f9a25020 sys/dev/pci/ichsmb.c
--- a/sys/dev/pci/ichsmb.c      Mon Dec 09 19:16:53 2019 +0000
+++ b/sys/dev/pci/ichsmb.c      Mon Dec 09 21:00:48 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ichsmb.c,v 1.61 2019/11/21 17:47:23 ad Exp $   */
+/*     $NetBSD: ichsmb.c,v 1.62 2019/12/09 21:00:48 ad Exp $   */
 /*     $OpenBSD: ichiic.c,v 1.18 2007/05/03 09:36:26 dlg Exp $ */
 
 /*
@@ -22,7 +22,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ichsmb.c,v 1.61 2019/11/21 17:47:23 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ichsmb.c,v 1.62 2019/12/09 21:00:48 ad Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
@@ -163,6 +163,7 @@
        sc->sc_pc = pa->pa_pc;
 
        pci_aprint_devinfo(pa, NULL);
+       mutex_init(&sc->sc_i2c_mutex, MUTEX_DEFAULT, IPL_NONE);
 
        /* Read configuration */
        conf = pci_conf_read(pa->pa_pc, pa->pa_tag, LPCIB_SMB_HOSTC);
@@ -208,7 +209,6 @@
 
        sc->sc_i2c_device = NULL;
        flags = 0;
-       mutex_init(&sc->sc_i2c_mutex, MUTEX_DEFAULT, IPL_NONE);
        ichsmb_rescan(self, "i2cbus", &flags);
 
 out:   if (!pmf_device_register(self, NULL, NULL))



Home | Main Index | Thread Index | Old Index