2023-07-04 11:12:27

by Minjie Du

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

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 <[email protected]>
---
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

2023-07-05 06:35:10

by Hans Verkuil

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

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 <[email protected]>
> ---
> 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 */