| Message ID | 20220818073352.3156288-1-zheyuma97@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 98d3f063be78ca71b578bc3fcf71033a335273db |
| Delegated to: | Kalle Valo |
| Headers | show |
| Series | wifi: rtl8xxxu: Simplify the error handling code | expand |
Zheyu Ma <zheyuma97@gmail.com> wrote: > Since the logic of the driver's error handling code has changed, the > previous dead store and checks are not needed. > > Reported-by: kernel test robot <lkp@intel.com> > Reported-by: Dan Carpenter <dan.carpenter@oracle.com> > Signed-off-by: Zheyu Ma <zheyuma97@gmail.com> Patch applied to wireless-next.git, thanks. 98d3f063be78 wifi: rtl8xxxu: Simplify the error handling code
diff --git a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c index c66f0726b253..e97e35b39225 100644 --- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c +++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c @@ -6657,7 +6657,6 @@ static int rtl8xxxu_probe(struct usb_interface *interface, hw = ieee80211_alloc_hw(sizeof(struct rtl8xxxu_priv), &rtl8xxxu_ops); if (!hw) { ret = -ENOMEM; - priv = NULL; goto err_put_dev; } @@ -6768,11 +6767,9 @@ static int rtl8xxxu_probe(struct usb_interface *interface, err_set_intfdata: usb_set_intfdata(interface, NULL); - if (priv) { - kfree(priv->fw_data); - mutex_destroy(&priv->usb_buf_mutex); - mutex_destroy(&priv->h2c_mutex); - } + kfree(priv->fw_data); + mutex_destroy(&priv->usb_buf_mutex); + mutex_destroy(&priv->h2c_mutex); ieee80211_free_hw(hw); err_put_dev:
Since the logic of the driver's error handling code has changed, the previous dead store and checks are not needed. Reported-by: kernel test robot <lkp@intel.com> Reported-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Zheyu Ma <zheyuma97@gmail.com> --- drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)