diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-03-16 10:46:33 +0900 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-03-16 10:46:33 +0900 |
| commit | 603980cecc71564e1c6289cd4d0704f11788dc3a (patch) | |
| tree | 18096db9401f71567dcc9e11efbaa3ea1dd8a40b | |
| parent | 4495c08e84729385774601b5146d51d9e5849f81 (diff) | |
| parent | 340837f985c2cb87ca0868d4aa9ce42b0fab3a21 (diff) | |
| download | linux-603980cecc71564e1c6289cd4d0704f11788dc3a.tar.gz linux-603980cecc71564e1c6289cd4d0704f11788dc3a.tar.bz2 linux-603980cecc71564e1c6289cd4d0704f11788dc3a.zip | |
Merge tag 'stm-fixes-for-greg-20170315' of git://git.kernel.org/pub/scm/linux/kernel/git/ash/stm into char-misc-linus
Alexander writes:
intel_th: Fixes for 4.11
These are:
* fix for a module refcount leak
* two new PCI IDs
| -rw-r--r-- | drivers/hwtracing/intel_th/core.c | 4 | ||||
| -rw-r--r-- | drivers/hwtracing/intel_th/pci.c | 10 |
2 files changed, 13 insertions, 1 deletions
diff --git a/drivers/hwtracing/intel_th/core.c b/drivers/hwtracing/intel_th/core.c index cdd9b3b26195..7563eceeaaea 100644 --- a/drivers/hwtracing/intel_th/core.c +++ b/drivers/hwtracing/intel_th/core.c @@ -221,8 +221,10 @@ static int intel_th_output_activate(struct intel_th_device *thdev) else intel_th_trace_enable(thdev); - if (ret) + if (ret) { pm_runtime_put(&thdev->dev); + module_put(thdrv->driver.owner); + } return ret; } diff --git a/drivers/hwtracing/intel_th/pci.c b/drivers/hwtracing/intel_th/pci.c index 0bba3842336e..590cf90dd21a 100644 --- a/drivers/hwtracing/intel_th/pci.c +++ b/drivers/hwtracing/intel_th/pci.c @@ -85,6 +85,16 @@ static const struct pci_device_id intel_th_pci_id_table[] = { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0xa2a6), .driver_data = (kernel_ulong_t)0, }, + { + /* Denverton */ + PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x19e1), + .driver_data = (kernel_ulong_t)0, + }, + { + /* Gemini Lake */ + PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x318e), + .driver_data = (kernel_ulong_t)0, + }, { 0 }, }; |