| From 0d6def51deecd6e7b6230bda259fef49a1b8bcc6 Mon Sep 17 00:00:00 2001 |
| From: Dan Carpenter <dan.carpenter@oracle.com> |
| Date: Mon, 17 Dec 2018 10:02:42 +0300 |
| Subject: 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> |
| --- |
| drivers/thermal/int340x_thermal/processor_thermal_device.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/drivers/thermal/int340x_thermal/processor_thermal_device.c b/drivers/thermal/int340x_thermal/processor_thermal_device.c |
| index f02341f7134d4..c6ab7db8c8e23 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, |
| -- |
| 2.19.1 |
| |
