Re: [PATCH] USB: g_serial: Allow to override the default VID/PID

[Jef Driesen]

On 20/11/10 01:12, Greg KH wrote:
> On Sat, Nov 20, 2010 at 12:32:34AM +0100, Jef Driesen wrote:
> > Override the default VID/PID if custom values are supplied through the
> > idVendor and idProduct kernel module parameters.
> >
> > Signed-off-by: Jef Driesen<jefdriesen@xxxxxxxxxx>
>
> So this patch resolves the bug found in
> 1ab83238740ff1e1773d5c13ecac43c60cf4aec4 which showed up in .35-rc1,
> right?

Yes, although I'm really sure it is the best way to fix the problem. The way I 
understand this code is that before that commit, the 
idVendor/idProduct/bcdDevice module parameters where set after the bind(). Thus 
whatever was set as the default there got replaced with the values of the module 
parameters. Exactly what I would consider the correct behavior. After the 
commit, they get set before bind(), where they are changed back to the hardcoded 
values, which I think is wrong. My patch sets them back to the right values, but 
maybe it makes more sense to not set the default values in the first place (if 
there are already values in place of course). But I didn't knew how to 
accomplish that.

There might be similar problems for the other gadget drivers as well. I haven't 
checked that.

> > ---
> >   drivers/usb/gadget/serial.c |    5 +++++
> >   1 files changed, 5 insertions(+), 0 deletions(-)
> >
> > diff --git a/drivers/usb/gadget/serial.c b/drivers/usb/gadget/serial.c
> > index f46a609..77b410e 100644
> > --- a/drivers/usb/gadget/serial.c
> > +++ b/drivers/usb/gadget/serial.c
> > @@ -271,6 +271,11 @@ static int __init init(void)
> >   	}
> >   	strings_dev[STRING_DESCRIPTION_IDX].s = serial_config_driver.label;
> >
> > +	if (idVendor)
> > +		device_desc.idVendor = idVendor;
> > +	if (idProduct)
> > +		device_desc.idProduct = idProduct;
> > +
> >   	return usb_composite_register(&gserial_driver);
> >   }
> >   module_init(init);
> > --
> > 1.7.1
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/