hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

intel_th: Fixes for 4.11 

These are:
  * fix for a module refcount leak
  * two new PCI IDs
 -----BEGIN PGP SIGNATURE-----
 
 iJkEABEIAEEWIQQSviFCoXpKPDNATbnrxfYkYwVX/wUCWMk6PSMcYWxleGFuZGVy
 LnNoaXNoa2luQGxpbnV4LmludGVsLmNvbQAKCRDrxfYkYwVX/8XzAP4yEJrohNCs
 BUoyCVhLiOOIatwceIOZ9Q0xdNyVggMAaQD9ECqFBUMhiJciOMqlZWz0j7DyN33m
 h51lIPHEPlD/5o0=
 =7OP4
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Greg Kroah-Hartman 2017-03-16 10:46:33 +09:00
parent 4495c08e84 340837f985
commit 603980cecc
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/hwtracing/intel_th/core.c
View File

@ -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;
}

10
drivers/hwtracing/intel_th/pci.c
View File

@ -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 },
};