From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Dan Carpenter <dan.carpenter@oracle.com>,
Zhang Rui <rui.zhang@intel.com>, Sasha Levin <sashal@kernel.org>,
linux-pm@vger.kernel.org
Subject: [PATCH AUTOSEL 4.4 04/20] thermal: int340x_thermal: Fix a NULL vs IS_ERR() check
Date: Thu, 14 Feb 2019 21:14:55 -0500 [thread overview]
Message-ID: <20190215021511.179333-4-sashal@kernel.org> (raw)
In-Reply-To: <20190215021511.179333-1-sashal@kernel.org>
From: Dan Carpenter <dan.carpenter@oracle.com>
[ 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 ccc0ad02d066..7f374ab5b176 100644
--- a/drivers/thermal/int340x_thermal/processor_thermal_device.c
+++ b/drivers/thermal/int340x_thermal/processor_thermal_device.c
@@ -363,7 +363,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
next prev parent reply other threads:[~2019-02-15 2:20 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-15 2:14 [PATCH AUTOSEL 4.4 01/20] drm/msm: Unblock writer if reader closes file Sasha Levin
2019-02-15 2:14 ` [PATCH AUTOSEL 4.4 02/20] ASoC: Intel: Haswell/Broadwell: fix setting for .dynamic field Sasha Levin
2019-02-15 2:14 ` [PATCH AUTOSEL 4.4 03/20] ALSA: compress: prevent potential divide by zero bugs Sasha Levin
2019-02-15 2:14 ` Sasha Levin [this message]
2019-02-15 2:14 ` [PATCH AUTOSEL 4.4 05/20] usb: dwc3: gadget: Fix the uninitialized link_state when udc starts Sasha Levin
2019-02-15 2:14 ` [PATCH AUTOSEL 4.4 06/20] usb: gadget: Potential NULL dereference on allocation error Sasha Levin
2019-02-15 2:14 ` [PATCH AUTOSEL 4.4 07/20] ASoC: dapm: change snprintf to scnprintf for possible overflow Sasha Levin
2019-02-15 2:14 ` [PATCH AUTOSEL 4.4 08/20] ASoC: imx-audmux: " Sasha Levin
2019-02-15 2:15 ` [PATCH AUTOSEL 4.4 09/20] ARC: fix __ffs return value to avoid build warnings Sasha Levin
2019-02-15 2:15 ` [PATCH AUTOSEL 4.4 10/20] mac80211: fix miscounting of ttl-dropped frames Sasha Levin
2019-02-15 2:15 ` [PATCH AUTOSEL 4.4 11/20] libceph: avoid KEEPALIVE_PENDING races in ceph_con_keepalive() Sasha Levin
2019-02-15 2:15 ` [PATCH AUTOSEL 4.4 12/20] serial: fsl_lpuart: fix maximum acceptable baud rate with over-sampling Sasha Levin
2019-02-15 2:15 ` [PATCH AUTOSEL 4.4 13/20] scsi: csiostor: fix NULL pointer dereference in csio_vport_set_state() Sasha Levin
2019-02-15 2:15 ` [PATCH AUTOSEL 4.4 14/20] net: altera_tse: fix connect_local_phy error path Sasha Levin
2019-02-15 2:15 ` [PATCH AUTOSEL 4.4 15/20] sfc: suppress duplicate nvmem partition types in efx_ef10_mtd_probe Sasha Levin
2019-02-15 2:15 ` [PATCH AUTOSEL 4.4 16/20] ax25: fix possible use-after-free Sasha Levin
2019-02-15 2:15 ` [PATCH AUTOSEL 4.4 17/20] ibmveth: Do not process frames after calling napi_reschedule Sasha Levin
2019-02-15 2:15 ` [PATCH AUTOSEL 4.4 18/20] mac80211: don't initiate TDLS connection if station is not associated to AP Sasha Levin
2019-02-15 2:15 ` [PATCH AUTOSEL 4.4 19/20] cfg80211: extend range deviation for DMG Sasha Levin
2019-02-15 2:15 ` [PATCH AUTOSEL 4.4 20/20] KVM: nSVM: clear events pending from svm_complete_interrupts() when exiting to L1 Sasha Levin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190215021511.179333-4-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=dan.carpenter@oracle.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=rui.zhang@intel.com \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox