[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <20200917123019.206382-1-huangguobin4@huawei.com>
Date: Thu, 17 Sep 2020 08:30:19 -0400
From: Huang Guobin <huangguobin4@...wei.com>
To: <ajay.kathat@...rochip.com>, <claudiu.beznea@...rochip.com>,
<kvalo@...eaurora.org>, <davem@...emloft.net>, <kuba@...nel.org>,
<gregkh@...uxfoundation.org>
CC: <linux-wireless@...r.kernel.org>, <netdev@...r.kernel.org>,
<linux-kernel@...r.kernel.org>
Subject: [PATCH net] net: wilc1000: clean up resource in error path of init mon interface
The wilc_wfi_init_mon_int() forgets to clean up resource when
register_netdevice() failed. Add the missed call to fix it.
And the return value of netdev_priv can't be NULL, so remove
the unnecessary error handling.
Fixes: 588713006ea4 ("staging: wilc1000: avoid the use of 'wilc_wfi_mon' static variable")
Reported-by: Hulk Robot <hulkci@...wei.com>
Signed-off-by: Huang Guobin <huangguobin4@...wei.com>
---
drivers/net/wireless/microchip/wilc1000/mon.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/net/wireless/microchip/wilc1000/mon.c b/drivers/net/wireless/microchip/wilc1000/mon.c
index 358ac8601333..b5a1b65c087c 100644
--- a/drivers/net/wireless/microchip/wilc1000/mon.c
+++ b/drivers/net/wireless/microchip/wilc1000/mon.c
@@ -235,11 +235,10 @@ struct net_device *wilc_wfi_init_mon_interface(struct wilc *wl,
if (register_netdevice(wl->monitor_dev)) {
netdev_err(real_dev, "register_netdevice failed\n");
+ free_netdev(wl->monitor_dev);
return NULL;
}
priv = netdev_priv(wl->monitor_dev);
- if (!priv)
- return NULL;
priv->real_ndev = real_dev;
--
2.25.1
Powered by blists - more mailing lists