From 0ef1cda18e05aa6d0b0ea745ce194f33d8f03973 Mon Sep 17 00:00:00 2001
From: Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Date: Wed, 30 Apr 2014 16:27:31 +0200
Subject: [PATCH] Found same errors using a static code analysis program
called cppcheck.
---
drivers/isdn/hisax/l3dss1.c | 8 ++++++--
drivers/isdn/hisax/l3ni1.c | 8 ++++++--
drivers/isdn/mISDN/dsp_cmx.c | 3 ---
3 filer ändrade, 12 tillägg(+), 7 borttagningar(-)
@@ -2208,8 +2208,12 @@ static int l3dss1_cmd_global(struct PStack *st, isdn_ctrl *ic)
{ free_invoke_id(st, id);
return (-2);
}
- pc->prot.dss1.ll_id = ic->parm.dss1_io.ll_id; /* remember id */
- pc->prot.dss1.proc = ic->parm.dss1_io.proc; /* and procedure */
+
+ if (pc)
+ {
+ pc->prot.dss1.ll_id = ic->parm.dss1_io.ll_id; /* remember id */
+ pc->prot.dss1.proc = ic->parm.dss1_io.proc; /* and procedure */
+ }
if (!(skb = l3_alloc_skb(l)))
{ free_invoke_id(st, id);
@@ -2064,8 +2064,12 @@ static int l3ni1_cmd_global(struct PStack *st, isdn_ctrl *ic)
{ free_invoke_id(st, id);
return (-2);
}
- pc->prot.ni1.ll_id = ic->parm.ni1_io.ll_id; /* remember id */
- pc->prot.ni1.proc = ic->parm.ni1_io.proc; /* and procedure */
+
+ if (pc)
+ {
+ pc->prot.ni1.ll_id = ic->parm.ni1_io.ll_id; /* remember id */
+ pc->prot.ni1.proc = ic->parm.ni1_io.proc; /* and procedure */
+ }
if (!(skb = l3_alloc_skb(l)))
{ free_invoke_id(st, id);
@@ -1511,9 +1511,6 @@ dsp_cmx_send_member(struct dsp *dsp, int len, s32 *c, int members)
dsp->tx_R = t;
goto send_packet;
}
-#ifdef DSP_NEVER_DEFINED
- }
-#endif
/* PROCESS DATA (three or more members) */
/* -> if echo is NOT enabled */
if (!dsp->echo.software) {
--
1.7.10.4