diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2024-08-17 02:24:07 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2024-08-17 02:24:07 +0000 |
| commit | 496eaacdbc2b171991fd2e4d99f15e0ae3bc1763 (patch) | |
| tree | 309dd42abb02743def1ce056c319ad7887b58815 /sys/dev/pci/dwiic_pci.c | |
| parent | b277ca6fbaa2aaaab5ad76d9a7ae8bcfaee83215 (diff) | |
dwiic_activate did not inform sub-devices with config_activate_children()
calls from the correct places, so their DVACT_QUIESCE and DVACT_WAKEUP
were incorrect, and led to those sub-drivers (ihidev and imt) racing
against dwiic hardware re-initialization.
ok kettenis mlarkin
Diffstat (limited to 'sys/dev/pci/dwiic_pci.c')
| -rw-r--r-- | sys/dev/pci/dwiic_pci.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/sys/dev/pci/dwiic_pci.c b/sys/dev/pci/dwiic_pci.c index 68f25f37d33..3d3548c0e74 100644 --- a/sys/dev/pci/dwiic_pci.c +++ b/sys/dev/pci/dwiic_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dwiic_pci.c,v 1.28 2024/08/17 02:14:21 deraadt Exp $ */ +/* $OpenBSD: dwiic_pci.c,v 1.29 2024/08/17 02:24:06 deraadt Exp $ */ /* * Synopsys DesignWare I2C controller * PCI attachment @@ -298,10 +298,7 @@ dwiic_pci_activate(struct device *self, int act) (LPSS_RESETS_I2C | LPSS_RESETS_IDMA)); break; } - - dwiic_activate(self, act); - - return 0; + return dwiic_activate(self, act); } void |