drivers: usb: remove duplicate logical judgments in if

[PATCH v1] drivers: usb: remove duplicate logical judgments in if

Posted by Minjie Du 2 years, 7 months ago

Fix: delate duplicate judgments
Does the judgment content of this if
mean requesting confirmation twice?
I'm not sure, Could you help check it out?
Thank you!

Signed-off-by: Minjie Du <duminjie@vivo.com>
---
 drivers/media/usb/go7007/go7007-usb.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/media/usb/go7007/go7007-usb.c b/drivers/media/usb/go7007/go7007-usb.c
index eeb85981e..c85e48e16 100644
--- a/drivers/media/usb/go7007/go7007-usb.c
+++ b/drivers/media/usb/go7007/go7007-usb.c
@@ -653,8 +653,7 @@ static int go7007_usb_interface_reset(struct go7007 *go)
 	if (usb->board->flags & GO7007_USB_EZUSB) {
 		/* Reset buffer in EZ-USB */
 		pr_debug("resetting EZ-USB buffers\n");
-		if (go7007_usb_vendor_request(go, 0x10, 0, 0, NULL, 0, 0) < 0 ||
-		    go7007_usb_vendor_request(go, 0x10, 0, 0, NULL, 0, 0) < 0)
+		if (go7007_usb_vendor_request(go, 0x10, 0, 0, NULL, 0, 0) < 0)
 			return -1;
 
 		/* Reset encoder again */
-- 
2.39.0

Re: [PATCH v1] drivers: usb: remove duplicate logical judgments in if

Posted by Hans Verkuil 2 years, 7 months ago

Hi Minjie,

On 04/07/2023 12:40, Minjie Du wrote:
> Fix: delate duplicate judgments
> Does the judgment content of this if
> mean requesting confirmation twice?
> I'm not sure, Could you help check it out?
> Thank you!

From what I can tell it tries to send the reset request a
second time if the first attempt fails. Fair enough.

So let's leave this as-is.

Regards,

	Hans

> 
> Signed-off-by: Minjie Du <duminjie@vivo.com>
> ---
>  drivers/media/usb/go7007/go7007-usb.c | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/drivers/media/usb/go7007/go7007-usb.c b/drivers/media/usb/go7007/go7007-usb.c
> index eeb85981e..c85e48e16 100644
> --- a/drivers/media/usb/go7007/go7007-usb.c
> +++ b/drivers/media/usb/go7007/go7007-usb.c
> @@ -653,8 +653,7 @@ static int go7007_usb_interface_reset(struct go7007 *go)
>  	if (usb->board->flags & GO7007_USB_EZUSB) {
>  		/* Reset buffer in EZ-USB */
>  		pr_debug("resetting EZ-USB buffers\n");
> -		if (go7007_usb_vendor_request(go, 0x10, 0, 0, NULL, 0, 0) < 0 ||
> -		    go7007_usb_vendor_request(go, 0x10, 0, 0, NULL, 0, 0) < 0)
> +		if (go7007_usb_vendor_request(go, 0x10, 0, 0, NULL, 0, 0) < 0)
>  			return -1;
>  
>  		/* Reset encoder again */