2018-06-12 03:19:31

by Zhouyang Jia

Subject: [PATCH] staging: rtl8712: add error handling for register_netdev

When register_netdev fails, the lack of error-handling code may
cause unexpected results.

This patch adds error-handling code after calling register_netdev.

Signed-off-by: Zhouyang Jia <[email protected]>
---
drivers/staging/rtl8712/hal_init.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/drivers/staging/rtl8712/hal_init.c b/drivers/staging/rtl8712/hal_init.c
index 2a3f074..2b47e75 100644
--- a/drivers/staging/rtl8712/hal_init.c
+++ b/drivers/staging/rtl8712/hal_init.c
@@ -40,6 +40,7 @@
static void rtl871x_load_fw_cb(const struct firmware *firmware, void *context)
{
struct _adapter *padapter = context;
+ int rc;

complete(&padapter->rtl8712_fw_ready);
if (!firmware) {
@@ -53,7 +54,12 @@ static void rtl871x_load_fw_cb(const struct firmware *firmware, void *context)
}
padapter->fw = firmware;
/* firmware available - start netdev */
- register_netdev(padapter->pnetdev);
+ rc = register_netdev(padapter->pnetdev);
+ if (rc) {
+ struct usb_device *udev = padapter->dvobjpriv.pusbdev;
+
+ dev_err(&udev->dev, "r8712u: Unable to register netdev\n");
+ }
}

static const char firmware_file[] = "rtlwifi/rtl8712u.bin";
--
2.7.4

2018-06-12 11:35:36

by Dan Carpenter

Subject: Re: [PATCH] staging: rtl8712: add error handling for register_netdev

On Tue, Jun 12, 2018 at 11:18:43AM +0800, Zhouyang Jia wrote:
> When register_netdev fails, the lack of error-handling code may
> cause unexpected results.
>
> This patch adds error-handling code after calling register_netdev.
>

It doesn't add any error handling. It just adds an error message.

The error handling does look sort of messed up, but this isn't a useful
patch.

regards,
dan carpenter