Sebastian Andrzej Siewior <bige...@linutronix.de> writes:
> This is a partly revert of 4fffd6e5 ("usb: gadget: composite: make
> module parameters accessible at runtime").
> It is not possible to change the VID or other properly for a gadget
> right now. This change has been made for Anrdoid gadget which has this
> change in its copy of the file. This function is executed currently only
> once and post caller in tree __init.
>
> Signed-off-by: Sebastian Andrzej Siewior <bige...@linutronix.de>
Acked-by: Michal Nazarewicz <min...@mina86.com>
> ---
> drivers/usb/gadget/composite.c | 20 ++++++++------------
> 1 file changed, 8 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c
> index 0f548fe..153efc4 100644
> --- a/drivers/usb/gadget/composite.c
> +++ b/drivers/usb/gadget/composite.c
> @@ -34,27 +34,27 @@
> */
>
> static ushort idVendor;
> -module_param(idVendor, ushort, 0644);
> +module_param(idVendor, ushort, S_IRUGO);
> MODULE_PARM_DESC(idVendor, "USB Vendor ID");
>
> static ushort idProduct;
> -module_param(idProduct, ushort, 0644);
> +module_param(idProduct, ushort, S_IRUGO);
> MODULE_PARM_DESC(idProduct, "USB Product ID");
>
> static ushort bcdDevice;
> -module_param(bcdDevice, ushort, 0644);
> +module_param(bcdDevice, ushort, S_IRUGO);
> MODULE_PARM_DESC(bcdDevice, "USB Device version (BCD)");
>
> static char *iManufacturer;
> -module_param(iManufacturer, charp, 0644);
> +module_param(iManufacturer, charp, S_IRUGO);
> MODULE_PARM_DESC(iManufacturer, "USB Manufacturer string");
>
> static char *iProduct;
> -module_param(iProduct, charp, 0644);
> +module_param(iProduct, charp, S_IRUGO);
> MODULE_PARM_DESC(iProduct, "USB Product string");
>
> static char *iSerialNumber;
> -module_param(iSerialNumber, charp, 0644);
> +module_param(iSerialNumber, charp, S_IRUGO);
> MODULE_PARM_DESC(iSerialNumber, "SerialNumber string");
>
> static char composite_manufacturer[50];
> @@ -1478,16 +1478,12 @@ static int composite_bind(struct usb_gadget *gadget,
> /* standardized runtime overrides for device ID data */
> if (idVendor)
> cdev->desc.idVendor = cpu_to_le16(idVendor);
> - else
> - idVendor = le16_to_cpu(cdev->desc.idVendor);
> +
> if (idProduct)
> cdev->desc.idProduct = cpu_to_le16(idProduct);
> - else
> - idProduct = le16_to_cpu(cdev->desc.idProduct);
> +
> if (bcdDevice)
> cdev->desc.bcdDevice = cpu_to_le16(bcdDevice);
> - else
> - bcdDevice = le16_to_cpu(cdev->desc.bcdDevice);
>
> /* string overrides */
> if (iManufacturer || !cdev->desc.iManufacturer) {
> --
> 1.7.10.4
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-usb" in
> the body of a message to majord...@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
Best regards, _ _
.o. | Liege of Serenely Enlightened Majesty of o' \,=./ `o
..o | Computer Science, Michał “mina86” Nazarewicz (o o)
ooo +----<email/xmpp: m...@google.com>--------------ooO--(_)--Ooo--
pgpHMDOXbsVDY.pgp
Description: PGP signature
