diff options
| author |   Huang Guobin <huangguobin4@huawei.com> | 2020-09-17 08:30:19 -0400 |
|---|---|---|
| committer |   Kalle Valo <kvalo@codeaurora.org> | 2020-09-21 16:02:13 +0300 |
| commit | 55bd149978679742374c800e56e8f6bc74378bbe (patch) | |
| tree | 0f63c90a48fa750f3716ec9745edda19864717bf | |
| parent | ssb: Remove meaningless jump label to simplify the code (diff) | |
| download | linux-dev-55bd149978679742374c800e56e8f6bc74378bbe.tar.xz linux-dev-55bd149978679742374c800e56e8f6bc74378bbe.zip | |
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@huawei.com>
Signed-off-by: Huang Guobin <huangguobin4@huawei.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/20200917123019.206382-1-huangguobin4@huawei.com
| -rw-r--r-- | drivers/net/wireless/microchip/wilc1000/mon.c | 3 |
1 files changed, 1 insertions, 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; |