The following commit has been merged into the thermal/next branch of thermal:
Commit-ID: 447acc9decdc177f353fa13fb26208a89612d49c
Gitweb: https://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git//447acc9decdc177f353fa13fb26208a89612d49c
Author: Srinivas Pandruvada [off-list ref]
AuthorDate: Mon, 28 Jun 2021 11:32:32 -07:00
Committer: Daniel Lezcano [off-list ref]
CommitterDate: Tue, 29 Jun 2021 01:24:28 +02:00
thermal/drivers/int340x/processor_thermal: Fix warning for return value
Fix smatch warnings:
drivers/thermal/intel/int340x_thermal/processor_thermal_device_pci.c:258 proc_thermal_pci_probe() warn: missing error code 'ret'
Use PTR_ERR to return failure of thermal_zone_device_register().
Reported-by: kernel test robot <redacted>
Signed-off-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Signed-off-by: Daniel Lezcano <redacted>
Link: https://lore.kernel.org/r/20210628183232.62877-1-srinivas.pandruvada@linux.intel.com (local)
---
drivers/thermal/intel/int340x_thermal/processor_thermal_device_pci.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/thermal/intel/int340x_thermal/processor_thermal_device_pci.c b/drivers/thermal/intel/int340x_thermal/processor_thermal_device_pci.c
index ad7e2e3..11dd2e8 100644
--- a/drivers/thermal/intel/int340x_thermal/processor_thermal_device_pci.c
+++ b/drivers/thermal/intel/int340x_thermal/processor_thermal_device_pci.c
@@ -254,8 +254,10 @@ static int proc_thermal_pci_probe(struct pci_dev *pdev, const struct pci_device_
pci_info->tzone = thermal_zone_device_register("TCPU_PCI", 1, 1, pci_info,
&tzone_ops,
&tzone_params, 0, 0);
- if (IS_ERR(pci_info->tzone))
+ if (IS_ERR(pci_info->tzone)) {
+ ret = PTR_ERR(pci_info->tzone);
goto err_ret_mmio;
+ }
/* request and enable interrupt */
ret = pci_alloc_irq_vectors(pdev, 1, 1, PCI_IRQ_ALL_TYPES);