From: Pavel Skripkin Date: Sun, 13 Jun 2021 22:00:07 +0000 (+0300) Subject: staging: rtl8712: remove redundant check in r871xu_drv_init X-Git-Tag: v5.14-rc1~66^2~135 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=69d998f1e552f6e2e7b55f5058ce1ac7a72903f9;p=thirdparty%2Flinux.git 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 Link: https://lore.kernel.org/r/d367e5f39f22af44c545f8710cc18fb00f10e66c.1623620630.git.paskripkin@gmail.com Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/rtl8712/usb_intf.c b/drivers/staging/rtl8712/usb_intf.c index 64ddbd483a23b..f270824fe1184 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)