Commit efd49b8e authored by Javier Carrasco's avatar Javier Carrasco Committed by Guenter Roeck

hwmon: (chipcap2) fix return path in cc2_request_alarm_irqs()

The return path can be improved by returning upon first failure. The
current implementation would try to register the second interrupt even
if the first one failed, which is unnecessary.

Moreover, if no irqs are available, the return value should be zero
(the driver supports the use case with no interrupts). Currently the
initial value is unassigned and that may lead to returning an unknown
value if stack variables are not automatically set to zero and no irqs
were provided.
Reported-by: default avatarDan Carpenter <dan.carpenter@linaro.org>
Closes: https://lore.kernel.org/linux-hwmon/294e4634-89d4-415e-a723-b208d8770d7c@gmail.com/T/#tSigned-off-by: default avatarJavier Carrasco <javier.carrasco.cruz@gmail.com>
Link: https://lore.kernel.org/r/20240207-chipcap2_init_vars-v1-2-08cafe43e20e@gmail.comSigned-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
parent f16fb6d2
......@@ -670,7 +670,7 @@ static int cc2_request_ready_irq(struct cc2_data *data, struct device *dev)
static int cc2_request_alarm_irqs(struct cc2_data *data, struct device *dev)
{
int ret;
int ret = 0;
data->irq_low = fwnode_irq_get_byname(dev_fwnode(dev), "low");
if (data->irq_low > 0) {
......@@ -679,8 +679,10 @@ static int cc2_request_alarm_irqs(struct cc2_data *data, struct device *dev)
IRQF_ONESHOT |
IRQF_TRIGGER_RISING,
dev_name(dev), data);
if (!ret)
data->rh_alarm.low_alarm_visible = true;
if (ret)
return ret;
data->rh_alarm.low_alarm_visible = true;
}
data->irq_high = fwnode_irq_get_byname(dev_fwnode(dev), "high");
......@@ -690,8 +692,10 @@ static int cc2_request_alarm_irqs(struct cc2_data *data, struct device *dev)
IRQF_ONESHOT |
IRQF_TRIGGER_RISING,
dev_name(dev), data);
if (!ret)
data->rh_alarm.high_alarm_visible = true;
if (ret)
return ret;
data->rh_alarm.high_alarm_visible = true;
}
return ret;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment