Skip to contentSkip to conversation

rtl8712: add a check for the status of register_netdev

PATCH In review Kangjie Lu 2 participants 2 messages Dec 26, 2018 – Jan 2, 2019 Staging

lore
Share & tools
lore

Kangjie Lu

author
#0 lore raw

PATCH v2 1/1 rtl8712: add a check for the status of register_netdev

register_netdev() may fail, so let's check its return value, and if it fails, issue an error message.

---
 drivers/staging/rtl8712/hal_init.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/staging/rtl8712/hal_init.c +3 -2
index 7cdd609cab6c..ca0858660a45 100644
@@ -32,10 +32,10 @@
 static void rtl871x_load_fw_cb(const struct firmware *firmware, void *context)
 {
 	struct _adapter *padapter = context;
+	struct usb_device *udev = padapter->dvobjpriv.pusbdev;
 
 	complete(&padapter->rtl8712_fw_ready);
 	if (!firmware) {
-		struct usb_device *udev = padapter->dvobjpriv.pusbdev;
 		struct usb_interface *pusb_intf = padapter->pusb_intf;
 
 		dev_err(&udev->dev, "r8712u: Firmware request failed\n");
@@ -45,7 +45,8 @@ static void rtl871x_load_fw_cb(const struct firmware *firmware, void *context)
 	}
 	padapter->fw = firmware;
 	/* firmware available - start netdev */
-	register_netdev(padapter->pnetdev);
+	if (register_netdev(padapter->pnetdev))
+		dev_err(&udev->dev, "r8712u: Registering netdev failed\n");
 }
 
 static const char firmware_file[] = "rtlwifi/rtl8712u.bin";
Signature · 1 line
2.17.2 (Apple Git-113)
#1 lore raw
Quoted 25 lines · Kangjie Lu

register_netdev() may fail, so let's check its return value, and if it fails, issue an error message.

---
 drivers/staging/rtl8712/hal_init.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/staging/rtl8712/hal_init.c +1 -1
index 7cdd609cab6c..ca0858660a45 100644
@@ -32,10 +32,10 @@
 static void rtl871x_load_fw_cb(const struct firmware *firmware, void *context)
 {
 	struct _adapter *padapter = context;
+	struct usb_device *udev = padapter->dvobjpriv.pusbdev;
 
 	complete(&padapter->rtl8712_fw_ready);
 	if (!firmware) {
-		struct usb_device *udev = padapter->dvobjpriv.pusbdev;
 		struct usb_interface *pusb_intf = padapter->pusb_intf;
 
 		dev_err(&udev->dev, "r8712u: Firmware request failed\n");

drivers/staging/rtl8712/hal_init.c static void rtl871x_load_fw_cb(const struct firmware *firmware, void *context) · line 49

Quoted 6 lines
drivers/staging/rtl8712/hal_init.c +2 -1
@@ -45,7 +45,8 @@ static void rtl871x_load_fw_cb(const struct firmware *firmware, void *context)
 	}
 	padapter->fw = firmware;
 	/* firmware available - start netdev */
-	register_netdev(padapter->pnetdev);
+	if (register_netdev(padapter->pnetdev))
+		dev_err(&udev->dev, "r8712u: Registering netdev failed\n");

This error handling doesn't seem complete. You're just adding the minimum to make the static analysis tool happy.

If you leave the code as-is, maybe someone else will see the static analysis warning and fix it properly. But you're silencing the warning so now no one will fix it.

Warnings are valuable. Don't silence them without fixing the bug.

regards,
dan carpenter