Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 603980ce authored Mar 16, 2017 by Greg Kroah-Hartman

Merge tag 'stm-fixes-for-greg-20170315' of...

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

parents 4495c08e 340837f9

drivers/hwtracing/intel_th/core.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -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;
		}

drivers/hwtracing/intel_th/pci.c

+10 −0

Original line number	Diff line number	Diff line
		@@ -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 },
		};