Skip to contentSkip to conversation

soc: ti: k3-ringacc: fix: warn: variable dereferenced before check 'ring'

PATCH New Grygorii Strashko 1 participant 1 message Jun 22, 2020 TI Keystone multicore navigator drivers

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 soc: ti: k3-ringacc: fix: warn: variable dereferenced before check 'ring'

Fix build warning in k3_ringacc_ring_cfg():

smatch warnings:
drivers/soc/ti/k3-ringacc.c:562 k3_ringacc_ring_cfg() warn: variable dereferenced before check 'ring' (see line 559)

557 int k3_ringacc_ring_cfg(struct k3_ring *ring, struct k3_ring_cfg *cfg) 558 {

 @559           struct k3_ringacc *ringacc = ring->parent;
                                             ^^^^^^^^^^^^

Dereference.

560 int ret = 0;
561
@562 if (!ring || !cfg)

                    ^^^^

Check too late. Delete it?

---
 drivers/soc/ti/k3-ringacc.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/soc/ti/k3-ringacc.c +3 -1
index 5fb2ee2ac978..19156f15af0a 100644
@@ -556,11 +556,13 @@ static int k3_ringacc_ring_cfg_sci(struct k3_ring *ring)
 
 int k3_ringacc_ring_cfg(struct k3_ring *ring, struct k3_ring_cfg *cfg)
 {
-	struct k3_ringacc *ringacc = ring->parent;
+	struct k3_ringacc *ringacc;
 	int ret = 0;
 
 	if (!ring || !cfg)
 		return -EINVAL;
+	ringacc = ring->parent;
+
 	if (cfg->elm_size > K3_RINGACC_RING_ELSIZE_256 ||
 	    cfg->mode >= K3_RINGACC_RING_MODE_INVALID ||
 	    cfg->size & ~K3_RINGACC_CFG_RING_SIZE_ELCNT_MASK ||
Signature · 1 line
2.17.1