diff options
| author | Dan Carpenter <dan.carpenter@oracle.com> | 2018-12-17 10:02:42 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-03-05 17:57:59 +0100 |
| commit | 7330b4d0088a726876cb855810260e6ed785f123 (patch) | |
| tree | 8f0ce688326f77bef5af00c1911cde83892f077f /drivers/thermal | |
| parent | ffc6b61f38a7165e488de0dba1ffd46f676cc0f7 (diff) | |
| download | linux-stable-7330b4d0088a726876cb855810260e6ed785f123.tar.gz linux-stable-7330b4d0088a726876cb855810260e6ed785f123.tar.bz2 linux-stable-7330b4d0088a726876cb855810260e6ed785f123.zip | |
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: 4d0dd6c1576b ("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>
Diffstat (limited to 'drivers/thermal')
| -rw-r--r-- | drivers/thermal/int340x_thermal/processor_thermal_device.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/thermal/int340x_thermal/processor_thermal_device.c b/drivers/thermal/int340x_thermal/processor_thermal_device.c index f02341f7134d..c6ab7db8c8e2 100644 --- a/drivers/thermal/int340x_thermal/processor_thermal_device.c +++ b/drivers/thermal/int340x_thermal/processor_thermal_device.c @@ -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, |