From e24f30198933437a0a11dd9e2181ee169fa2c918 Mon Sep 17 00:00:00 2001 From: Michael Black Date: Sun, 12 Jan 2020 23:08:44 -0600 Subject: [PATCH] Fix cppcheck warning in elektor507.c --- kit/elektor507.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/kit/elektor507.c b/kit/elektor507.c index af0d81580..004415fa3 100644 --- a/kit/elektor507.c +++ b/kit/elektor507.c @@ -379,15 +379,17 @@ int elektor507_init(RIG *rig) hamlib_port_t *rp = &rig->state.rigport; struct elektor507_priv_data *priv; - priv = (struct elektor507_priv_data *)calloc(sizeof(struct + rig->state.priv = (struct elektor507_priv_data *)calloc(sizeof(struct elektor507_priv_data), 1); - if (!priv) + if (!rig->state.priv) { /* whoops! memory shortage! */ return -RIG_ENOMEM; } + priv = rig->state.priv; + priv->xtal_cal = XTAL_CAL; priv->osc_freq = OSCFREQ; priv->ant = ANT_AUTO; @@ -403,8 +405,6 @@ int elektor507_init(RIG *rig) rp->parm.usb.iface = 0; rp->parm.usb.alt = 0; /* necessary ? */ - rig->state.priv = (void *)priv; - return RIG_OK; }