Skip to content

Commit

Permalink
Merge tag 'stm-fixes-for-greg-20170315' of git://git.kernel.org/pub/s…
Browse files Browse the repository at this point in the history
…cm/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
  • Loading branch information
gregkh committed Mar 16, 2017
2 parents 4495c08 + 340837f commit 603980c
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 1 deletion.
4 changes: 3 additions & 1 deletion drivers/hwtracing/intel_th/core.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
10 changes: 10 additions & 0 deletions drivers/hwtracing/intel_th/pci.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 },
};

Expand Down

0 comments on commit 603980c

Please sign in to comment.