aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPavel Skripkin <paskripkin@gmail.com>2021-06-14 01:00:07 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-06-14 16:48:09 +0200
commit69d998f1e552f6e2e7b55f5058ce1ac7a72903f9 (patch)
tree1c02a30cd6f71fa55bce58977024e64a7327d108
parentstaging: rtl8188eu: remove another write-only member (diff)
downloadlinux-dev-69d998f1e552f6e2e7b55f5058ce1ac7a72903f9.tar.xz
linux-dev-69d998f1e552f6e2e7b55f5058ce1ac7a72903f9.zip
staging: rtl8712: remove redundant check in r871xu_drv_init
padapter->dvobj_init is initialized rigth before initialization check. There is no need for any branching here. Signed-off-by: Pavel Skripkin <paskripkin@gmail.com> Link: https://lore.kernel.org/r/d367e5f39f22af44c545f8710cc18fb00f10e66c.1623620630.git.paskripkin@gmail.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/staging/rtl8712/usb_intf.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/staging/rtl8712/usb_intf.c b/drivers/staging/rtl8712/usb_intf.c
index 64ddbd483a23..f270824fe118 100644
--- a/drivers/staging/rtl8712/usb_intf.c
+++ b/drivers/staging/rtl8712/usb_intf.c
@@ -379,13 +379,11 @@ static int r871xu_drv_init(struct usb_interface *pusb_intf,
/* step 3.
* initialize the dvobj_priv
*/
- if (!padapter->dvobj_init) {
+
+ status = padapter->dvobj_init(padapter);
+ if (status != _SUCCESS)
goto error;
- } else {
- status = padapter->dvobj_init(padapter);
- if (status != _SUCCESS)
- goto error;
- }
+
/* step 4. */
status = r8712_init_drv_sw(padapter);
if (status)