* [PATCH] media: go7007: Fix URB type for interrupt handling
@ 2020-02-06 15:45 Takashi Iwai
2020-02-07 8:49 ` Mauro Carvalho Chehab
0 siblings, 1 reply; 3+ messages in thread
From: Takashi Iwai @ 2020-02-06 15:45 UTC (permalink / raw)
To: Hans Verkuil
Cc: Mauro Carvalho Chehab, Josef Möllers, linux-media, linux-kernel
Josef reported that his old-and-good Plextor ConvertX M402U video
converter spews lots of WARNINGs on the recent kernels, and it turned
out that the device uses a bulk endpoint for interrupt handling just
like 2250 board.
For fixing it, generalize the check with the proper verification of
the endpoint instead of hard-coded board type check.
Fixes: 7e5219d18e93 ("[media] go7007: Fix 2250 urb type")
Reported-and-tested-by: Josef Möllers <josef.moellers@suse.com>
BugLink: https://bugzilla.suse.com/show_bug.cgi?id=1162583
BugLink: https://bugzilla.kernel.org/show_bug.cgi?id=206427
Signed-off-by: Takashi Iwai <tiwai@suse.de>
---
drivers/media/usb/go7007/go7007-usb.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/media/usb/go7007/go7007-usb.c b/drivers/media/usb/go7007/go7007-usb.c
index ff2aa057c1fb..f889c9d740cd 100644
--- a/drivers/media/usb/go7007/go7007-usb.c
+++ b/drivers/media/usb/go7007/go7007-usb.c
@@ -1044,6 +1044,7 @@ static int go7007_usb_probe(struct usb_interface *intf,
struct go7007_usb *usb;
const struct go7007_usb_board *board;
struct usb_device *usbdev = interface_to_usbdev(intf);
+ struct usb_host_endpoint *ep;
unsigned num_i2c_devs;
char *name;
int video_pipe, i, v_urb_len;
@@ -1140,7 +1141,8 @@ static int go7007_usb_probe(struct usb_interface *intf,
if (usb->intr_urb->transfer_buffer == NULL)
goto allocfail;
- if (go->board_id == GO7007_BOARDID_SENSORAY_2250)
+ ep = usb->usbdev->ep_in[4];
+ if (usb_endpoint_type(&ep->desc) == USB_ENDPOINT_XFER_BULK)
usb_fill_bulk_urb(usb->intr_urb, usb->usbdev,
usb_rcvbulkpipe(usb->usbdev, 4),
usb->intr_urb->transfer_buffer, 2*sizeof(u16),
--
2.16.4
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] media: go7007: Fix URB type for interrupt handling
2020-02-06 15:45 [PATCH] media: go7007: Fix URB type for interrupt handling Takashi Iwai
@ 2020-02-07 8:49 ` Mauro Carvalho Chehab
2020-02-07 8:55 ` Takashi Iwai
0 siblings, 1 reply; 3+ messages in thread
From: Mauro Carvalho Chehab @ 2020-02-07 8:49 UTC (permalink / raw)
To: Takashi Iwai; +Cc: Hans Verkuil, Josef Möllers, linux-media, linux-kernel
Em Thu, 6 Feb 2020 16:45:27 +0100
Takashi Iwai <tiwai@suse.de> escreveu:
> Josef reported that his old-and-good Plextor ConvertX M402U video
> converter spews lots of WARNINGs on the recent kernels, and it turned
> out that the device uses a bulk endpoint for interrupt handling just
> like 2250 board.
>
> For fixing it, generalize the check with the proper verification of
> the endpoint instead of hard-coded board type check.
>
> Fixes: 7e5219d18e93 ("[media] go7007: Fix 2250 urb type")
> Reported-and-tested-by: Josef Möllers <josef.moellers@suse.com>
> BugLink: https://bugzilla.suse.com/show_bug.cgi?id=1162583
> BugLink: https://bugzilla.kernel.org/show_bug.cgi?id=206427
> Signed-off-by: Takashi Iwai <tiwai@suse.de>
>
> ---
> drivers/media/usb/go7007/go7007-usb.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/media/usb/go7007/go7007-usb.c b/drivers/media/usb/go7007/go7007-usb.c
> index ff2aa057c1fb..f889c9d740cd 100644
> --- a/drivers/media/usb/go7007/go7007-usb.c
> +++ b/drivers/media/usb/go7007/go7007-usb.c
> @@ -1044,6 +1044,7 @@ static int go7007_usb_probe(struct usb_interface *intf,
> struct go7007_usb *usb;
> const struct go7007_usb_board *board;
> struct usb_device *usbdev = interface_to_usbdev(intf);
> + struct usb_host_endpoint *ep;
> unsigned num_i2c_devs;
> char *name;
> int video_pipe, i, v_urb_len;
> @@ -1140,7 +1141,8 @@ static int go7007_usb_probe(struct usb_interface *intf,
> if (usb->intr_urb->transfer_buffer == NULL)
> goto allocfail;
>
> - if (go->board_id == GO7007_BOARDID_SENSORAY_2250)
> + ep = usb->usbdev->ep_in[4];
Hmm... why [4] above?
I mean, what other drivers do is something like:
for (i = 0; i < intf->num_altsetting; i++) {
for (j = 0; j < intf->altsetting[i].desc.bNumEndpoints; j++) {
ep = &intf->altsetting[i].endpoint[j].desc;
/* some logic to check ep and change alt if needed */
}
}
> + if (usb_endpoint_type(&ep->desc) == USB_ENDPOINT_XFER_BULK)
> usb_fill_bulk_urb(usb->intr_urb, usb->usbdev,
> usb_rcvbulkpipe(usb->usbdev, 4),
> usb->intr_urb->transfer_buffer, 2*sizeof(u16),
Cheers,
Mauro
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] media: go7007: Fix URB type for interrupt handling
2020-02-07 8:49 ` Mauro Carvalho Chehab
@ 2020-02-07 8:55 ` Takashi Iwai
0 siblings, 0 replies; 3+ messages in thread
From: Takashi Iwai @ 2020-02-07 8:55 UTC (permalink / raw)
To: Mauro Carvalho Chehab
Cc: Takashi Iwai, Hans Verkuil, Josef Möllers, linux-media,
linux-kernel
On Fri, 07 Feb 2020 09:49:09 +0100,
Mauro Carvalho Chehab wrote:
>
> Em Thu, 6 Feb 2020 16:45:27 +0100
> Takashi Iwai <tiwai@suse.de> escreveu:
>
> > Josef reported that his old-and-good Plextor ConvertX M402U video
> > converter spews lots of WARNINGs on the recent kernels, and it turned
> > out that the device uses a bulk endpoint for interrupt handling just
> > like 2250 board.
> >
> > For fixing it, generalize the check with the proper verification of
> > the endpoint instead of hard-coded board type check.
> >
> > Fixes: 7e5219d18e93 ("[media] go7007: Fix 2250 urb type")
> > Reported-and-tested-by: Josef Möllers <josef.moellers@suse.com>
> > BugLink: https://bugzilla.suse.com/show_bug.cgi?id=1162583
> > BugLink: https://bugzilla.kernel.org/show_bug.cgi?id=206427
> > Signed-off-by: Takashi Iwai <tiwai@suse.de>
> >
> > ---
> > drivers/media/usb/go7007/go7007-usb.c | 4 +++-
> > 1 file changed, 3 insertions(+), 1 deletion(-)
> >
> > diff --git a/drivers/media/usb/go7007/go7007-usb.c b/drivers/media/usb/go7007/go7007-usb.c
> > index ff2aa057c1fb..f889c9d740cd 100644
> > --- a/drivers/media/usb/go7007/go7007-usb.c
> > +++ b/drivers/media/usb/go7007/go7007-usb.c
> > @@ -1044,6 +1044,7 @@ static int go7007_usb_probe(struct usb_interface *intf,
> > struct go7007_usb *usb;
> > const struct go7007_usb_board *board;
> > struct usb_device *usbdev = interface_to_usbdev(intf);
> > + struct usb_host_endpoint *ep;
> > unsigned num_i2c_devs;
> > char *name;
> > int video_pipe, i, v_urb_len;
> > @@ -1140,7 +1141,8 @@ static int go7007_usb_probe(struct usb_interface *intf,
> > if (usb->intr_urb->transfer_buffer == NULL)
> > goto allocfail;
> >
> > - if (go->board_id == GO7007_BOARDID_SENSORAY_2250)
> > + ep = usb->usbdev->ep_in[4];
>
> Hmm... why [4] above?
>
> I mean, what other drivers do is something like:
>
> for (i = 0; i < intf->num_altsetting; i++) {
> for (j = 0; j < intf->altsetting[i].desc.bNumEndpoints; j++) {
> ep = &intf->altsetting[i].endpoint[j].desc;
> /* some logic to check ep and change alt if needed */
> }
> }
>
It corresponds to the endpoint for the created URB will be associated
with; i.e.
> > + if (usb_endpoint_type(&ep->desc) == USB_ENDPOINT_XFER_BULK)
> > usb_fill_bulk_urb(usb->intr_urb, usb->usbdev,
> > usb_rcvbulkpipe(usb->usbdev, 4),
here it's usb_rcvbulkpipe(dev, 4) or usb_rcvintpipe(dev, 4) indicating
the endpoint 4.
If it matters, it can be changed to
usb_pipe_endpoint(usb->usbdev, usb_rcvbulkpipe(usb->usbdev, 4))
too.
thanks,
Takashi
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-02-07 8:55 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-02-06 15:45 [PATCH] media: go7007: Fix URB type for interrupt handling Takashi Iwai
2020-02-07 8:49 ` Mauro Carvalho Chehab
2020-02-07 8:55 ` Takashi Iwai
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).