lkml.org 
[lkml]   [2014]   [Sep]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
SubjectRe: [PATCH resend 2/2] usb: serial: xsens_mt: always bind to interface number 1
From
Johan,

I noticed I submitted an error here. Will resend later today.

On Mon, Sep 1, 2014 at 11:39 AM, Frans Klaver <frans.klaver@xsens.com> wrote:
> Probe is testing if the current interface provides two bulk endpoints.
> While this achieves the goal of only binding to the correct interface,
> we already know we can find the device on interface number 1. Stop
> checking the endpoints and just return successfully when interface
> number 1 is probed.
>
> Signed-off-by: Frans Klaver <frans.klaver@xsens.com>
> ---
> drivers/usb/serial/xsens_mt.c | 23 ++++-------------------
> 1 file changed, 4 insertions(+), 19 deletions(-)
>
> diff --git a/drivers/usb/serial/xsens_mt.c b/drivers/usb/serial/xsens_mt.c
> index d500ccd..ea67ed9 100644
> --- a/drivers/usb/serial/xsens_mt.c
> +++ b/drivers/usb/serial/xsens_mt.c
> @@ -41,28 +41,13 @@ static const struct usb_device_id id_table[] = {
> };
> MODULE_DEVICE_TABLE(usb, id_table);
>
> -static int has_required_endpoints(const struct usb_host_interface *interface)
> -{
> - __u8 i;
> - int has_bulk_in = 0;
> - int has_bulk_out = 0;
> -
> - for (i = 0; i < interface->desc.bNumEndpoints; ++i) {
> - if (usb_endpoint_is_bulk_in(&interface->endpoint[i].desc))
> - has_bulk_in = 1;
> - else if (usb_endpoint_is_bulk_out(&interface->endpoint[i].desc))
> - has_bulk_out = 1;
> - }
> -
> - return has_bulk_in && has_bulk_out;
> -}
> -
> static int xsens_mt_probe(struct usb_serial *serial,
> const struct usb_device_id *id)
> {
> - if (!has_required_endpoints(serial->interface->cur_altsetting))
> - return -ENODEV;
> - return 0;
> + if (serial->interface->cur_altsetting.desc.bInterfaceNumber == 1)

This should be

if (serial->interface->cur_altsetting->desc.bInterfaceNumber == 1)


> + return 0;
> +
> + return -ENODEV;
> }
>
> static struct usb_serial_driver xsens_mt_device = {
> --
> 2.1.0
>


\
 
 \ /
  Last update: 2014-09-04 09:21    [W:0.070 / U:0.308 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site