Commit a59addac authored by Alexandra Diupina's avatar Alexandra Diupina Committed by David S. Miller

drivers/net: process the result of hdlc_open() and add call of hdlc_close() in uhdlc_close()

Process the result of hdlc_open() and call uhdlc_close()
in case of an error. It is necessary to pass the error
code up the control flow, similar to a possible
error in request_irq().
Also add a hdlc_close() call to the uhdlc_close()
because the comment to hdlc_close() says it must be called
by the hardware driver when the HDLC device is being closed

Found by Linux Verification Center (linuxtesting.org) with SVACE.

Fixes: c19b6d24 ("drivers/net: support hdlc function for QE-UCC")
Signed-off-by: default avatarAlexandra Diupina <adiupina@astralinux.ru>
Reviewed-by: default avatarChristophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 27bbf45e
...@@ -34,6 +34,8 @@ ...@@ -34,6 +34,8 @@
#define TDM_PPPOHT_SLIC_MAXIN #define TDM_PPPOHT_SLIC_MAXIN
#define RX_BD_ERRORS (R_CD_S | R_OV_S | R_CR_S | R_AB_S | R_NO_S | R_LG_S) #define RX_BD_ERRORS (R_CD_S | R_OV_S | R_CR_S | R_AB_S | R_NO_S | R_LG_S)
static int uhdlc_close(struct net_device *dev);
static struct ucc_tdm_info utdm_primary_info = { static struct ucc_tdm_info utdm_primary_info = {
.uf_info = { .uf_info = {
.tsa = 0, .tsa = 0,
...@@ -708,6 +710,7 @@ static int uhdlc_open(struct net_device *dev) ...@@ -708,6 +710,7 @@ static int uhdlc_open(struct net_device *dev)
hdlc_device *hdlc = dev_to_hdlc(dev); hdlc_device *hdlc = dev_to_hdlc(dev);
struct ucc_hdlc_private *priv = hdlc->priv; struct ucc_hdlc_private *priv = hdlc->priv;
struct ucc_tdm *utdm = priv->utdm; struct ucc_tdm *utdm = priv->utdm;
int rc = 0;
if (priv->hdlc_busy != 1) { if (priv->hdlc_busy != 1) {
if (request_irq(priv->ut_info->uf_info.irq, if (request_irq(priv->ut_info->uf_info.irq,
...@@ -731,10 +734,13 @@ static int uhdlc_open(struct net_device *dev) ...@@ -731,10 +734,13 @@ static int uhdlc_open(struct net_device *dev)
napi_enable(&priv->napi); napi_enable(&priv->napi);
netdev_reset_queue(dev); netdev_reset_queue(dev);
netif_start_queue(dev); netif_start_queue(dev);
hdlc_open(dev);
rc = hdlc_open(dev);
if (rc)
uhdlc_close(dev);
} }
return 0; return rc;
} }
static void uhdlc_memclean(struct ucc_hdlc_private *priv) static void uhdlc_memclean(struct ucc_hdlc_private *priv)
...@@ -824,6 +830,8 @@ static int uhdlc_close(struct net_device *dev) ...@@ -824,6 +830,8 @@ static int uhdlc_close(struct net_device *dev)
netdev_reset_queue(dev); netdev_reset_queue(dev);
priv->hdlc_busy = 0; priv->hdlc_busy = 0;
hdlc_close(dev);
return 0; return 0;
} }
......
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