diff options
| author |   Even Xu <even.xu@intel.com> | 2016-10-21 15:48:40 -0700 |
|---|---|---|
| committer |   Jiri Kosina <jkosina@suse.cz> | 2016-11-05 15:57:38 +0100 |
| commit | 2a1e3b932c5606e2b3671b82eb63929937eb1e0b (patch) | |
| tree | 8ba12a61d738607ee435587d70a8afa08ee9f4f3 /drivers/hid/intel-ish-hid/ipc | |
| parent | HID: intel-ish-hid: Move DMA disable code to new function (diff) | |
| download | linux-dev-2a1e3b932c5606e2b3671b82eb63929937eb1e0b.tar.xz linux-dev-2a1e3b932c5606e2b3671b82eb63929937eb1e0b.zip | |
HID: intel-ish-hid: Fix driver reinit failure
When built as a module, modprobe followed by rmmod can fail because
DMA was still active. So to fix this, DMA needs to be disabled during
module exit.
This change disables DMA during modules exit and change the ISH PCI
device status to D3.
Signed-off-by: Even Xu <even.xu@intel.com>
Acked-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid/intel-ish-hid/ipc')
| -rw-r--r-- | drivers/hid/intel-ish-hid/ipc/ipc.c | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/drivers/hid/intel-ish-hid/ipc/ipc.c b/drivers/hid/intel-ish-hid/ipc/ipc.c index 0e0dfa616fab..0c9ac4d5d850 100644 --- a/drivers/hid/intel-ish-hid/ipc/ipc.c +++ b/drivers/hid/intel-ish-hid/ipc/ipc.c @@ -905,6 +905,21 @@ struct ishtp_device *ish_dev_init(struct pci_dev *pdev) */ void ish_device_disable(struct ishtp_device *dev) { + struct pci_dev *pdev = dev->pdev; + + if (!pdev) + return; + + /* Disable dma communication between FW and host */ + if (ish_disable_dma(dev)) { + dev_err(&pdev->dev, + "Can't reset - stuck with DMA in-progress\n"); + return; + } + + /* Put ISH to D3hot state for power saving */ + pci_set_power_state(pdev, PCI_D3hot); + dev->dev_state = ISHTP_DEV_DISABLED; ish_clr_host_rdy(dev); } |