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

Commit c3e40a99 authored by Guenter Roeck's avatar Guenter Roeck
Browse files

hwmon: (fam15h_power) Fix pci_device_id array 



pci_match_id() takes an *array* of IDs which must be properly zero-
terminated.

Reported-by: default avatarBen Hutchings <ben@decadent.org.uk>
Cc: stable@vger.kernel.org # 3.0+: 00250ec9 hwmon: fam15h_power: fix bogus values
Cc: stable@vger.kernel.org # 3.0+
Signed-off-by: default avatarGuenter Roeck <guenter.roeck@ericsson.com>
Acked-by: default avatarJean Delvare <khali@linux-fr.org>
parent eae1415d

drivers/hwmon/fam15h_power.c

+6 −3
Original line number Diff line number Diff line
@@ -128,17 +128,20 @@ static bool __devinit fam15h_power_is_internal_node0(struct pci_dev *f4) 
 * counter saturations resulting in bogus power readings.

 * We correct this value ourselves to cope with older BIOSes.

 */

static DEFINE_PCI_DEVICE_TABLE(affected_device) = {

	{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_15H_NB_F4) },

	{ 0 }

};



static void __devinit tweak_runavg_range(struct pci_dev *pdev)

{

	u32 val;

	const struct pci_device_id affected_device = {

		PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_15H_NB_F4) };



	/*

	 * let this quirk apply only to the current version of the

	 * northbridge, since future versions may change the behavior

	 */

	if (!pci_match_id(&affected_device, pdev))

	if (!pci_match_id(affected_device, pdev))

		return;



	pci_bus_read_config_dword(pdev->bus,