Commit 26e284fa authored Dec 17, 2018 by Dan Carpenter Committed by Greg Kroah-Hartman Mar 05, 2019

thermal: int340x_thermal: Fix a NULL vs IS_ERR() check



[ Upstream commit 3fe931b31a4078395c1967f0495dcc9e5ec6b5e3 ]

The intel_soc_dts_iosf_init() function doesn't return NULL, it returns
error pointers.

Fixes: 4d0dd6c1 ("Thermal/int340x/processor_thermal: Enable auxiliary DTS for Braswell")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

parent a1639e1d

drivers/thermal/int340x_thermal/processor_thermal_device.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -416,7 +416,7 @@ static int proc_thermal_pci_probe(struct pci_dev *pdev,
		proc_priv->soc_dts = intel_soc_dts_iosf_init(
		INTEL_SOC_DTS_INTERRUPT_MSI, 2, 0);

		if (proc_priv->soc_dts && pdev->irq) {
		if (!IS_ERR(proc_priv->soc_dts) && pdev->irq) {
		ret = pci_enable_msi(pdev);
		if (!ret) {
		ret = request_threaded_irq(pdev->irq, NULL,