From: Pavel Skripkin paskripkin@gmail.com
[ Upstream commit 69d998f1e552f6e2e7b55f5058ce1ac7a72903f9 ]
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.162362063... Signed-off-by: Greg Kroah-Hartman gregkh@linuxfoundation.org Signed-off-by: Sasha Levin sashal@kernel.org --- drivers/staging/rtl8712/usb_intf.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/drivers/staging/rtl8712/usb_intf.c b/drivers/staging/rtl8712/usb_intf.c index 2fcd65260f4c..bc421925e84c 100644 --- a/drivers/staging/rtl8712/usb_intf.c +++ b/drivers/staging/rtl8712/usb_intf.c @@ -380,13 +380,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)