Skip to contentSkip to conversation

bus: mhi: ep: Fix an ignored error return from ida_alloc()

PATCH In review Yang Li 2 participants 2 messages Mar 4, 2022 – Mar 7, 2022

Subsystems (2)
lore
Share & tools
lore

Yang Li

author
#0 lore raw

PATCH 1/1 bus: mhi: ep: Fix an ignored error return from ida_alloc()

The return from the call to ida_alloc() is int, it can be a negative error code, however this is being assigned to an unsigned int variable 'mhi_cntrl->index', so assign the value to 'ret' concurrently to solve this problem without affecting other functions.

Eliminate the following coccicheck warning:
./drivers/bus/mhi/ep/main.c:1422:5-21: WARNING: Unsigned expression compared with zero: mhi_cntrl -> index < 0

---
 drivers/bus/mhi/ep/main.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/bus/mhi/ep/main.c +2 -4
index 3e98107f08c4..b27e90d97029 100644
@@ -1418,11 +1418,9 @@ int mhi_ep_register_controller(struct mhi_ep_cntrl *mhi_cntrl,
 	mhi_ep_mmio_set_env(mhi_cntrl, MHI_EE_AMSS);
 
 	/* Set controller index */
-	mhi_cntrl->index = ida_alloc(&mhi_ep_cntrl_ida, GFP_KERNEL);
-	if (mhi_cntrl->index < 0) {
-		ret = mhi_cntrl->index;
+	mhi_cntrl->index = ret = ida_alloc(&mhi_ep_cntrl_ida, GFP_KERNEL);
+	if (ret < 0)
 		goto err_destroy_wq;
-	}
 
 	irq_set_status_flags(mhi_cntrl->irq, IRQ_NOAUTOEN);
 	ret = request_irq(mhi_cntrl->irq, mhi_ep_irq, IRQF_TRIGGER_HIGH,
Signature · 1 line
2.20.1.7.g153144c
#1 lore raw
Quoted 11 lines · Yang Li

The return from the call to ida_alloc() is int, it can be a negative error code, however this is being assigned to an unsigned int variable 'mhi_cntrl->index', so assign the value to 'ret' concurrently to solve this problem without affecting other functions.

Eliminate the following coccicheck warning:
./drivers/bus/mhi/ep/main.c:1422:5-21: WARNING: Unsigned expression compared with zero: mhi_cntrl -> index < 0

Thanks for the fix. Since the MHI EP series is under development, I've squashed this patch with the original patch that added the offending code.

I'll make a note about this in changelog.

Quoted 9 lines
---
 drivers/bus/mhi/ep/main.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/bus/mhi/ep/main.c +0 -0
index 3e98107f08c4..b27e90d97029 100644

drivers/bus/mhi/ep/main.c int mhi_ep_register_controller(struct mhi_ep_cntrl *mhi_cntrl, · line 1425

Quoted 10 lines
drivers/bus/mhi/ep/main.c +2 -4
@@ -1418,11 +1418,9 @@ int mhi_ep_register_controller(struct mhi_ep_cntrl *mhi_cntrl,
 	mhi_ep_mmio_set_env(mhi_cntrl, MHI_EE_AMSS);
 
 	/* Set controller index */
-	mhi_cntrl->index = ida_alloc(&mhi_ep_cntrl_ida, GFP_KERNEL);
-	if (mhi_cntrl->index < 0) {
-		ret = mhi_cntrl->index;
+	mhi_cntrl->index = ret = ida_alloc(&mhi_ep_cntrl_ida, GFP_KERNEL);
+	if (ret < 0)
 		goto err_destroy_wq;
-	}

I've just used "ret" for catching the ida_alloc() and assigned it to index after success.

Thanks,
Mani

Quoted 6 lines
drivers/bus/mhi/ep/main.c +0 -0
 	irq_set_status_flags(mhi_cntrl->irq, IRQ_NOAUTOEN);
 	ret = request_irq(mhi_cntrl->irq, mhi_ep_irq, IRQF_TRIGGER_HIGH,
Signature · 1 line
2.20.1.7.g153144c