diff options
| author | Sebastian Andrzej Siewior <bigeasy@linutronix.de> | 2012-09-10 17:01:58 +0400 |
|---|---|---|
| committer | Felipe Balbi <balbi@ti.com> | 2012-09-10 17:13:02 +0400 |
| commit | cc2683c318a5bf192b75cd5c343b51009db0cf6c (patch) | |
| tree | 0ecbcd53bf42ab588208354fcabf7125d0d0a829 /include/linux/usb/composite.h | |
| parent | d33f74fce3756d51a0203cec3d0d278e3b48d827 (diff) | |
| download | linux-cc2683c318a5bf192b75cd5c343b51009db0cf6c.tar.xz | |
usb: gadget: Provide a default implementation of default manufacturer string
Some gadgets provide custom entry here. Some may override it with an
etntry that is also created by composite if there was no value sumbitted
at all.
This patch removes all "custom manufacturer" strings which are the same
as these which are created by composite. Then it moves the creation of
the default manufacturer string to usb_composite_overwrite_options() in
case no command line argument has been used and the entry is still an
empty string.
By doing this we get rid of the global variable "composite_manufacturer"
in composite.
Acked-by: Michal Nazarewicz <mina86@mina86.com>
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'include/linux/usb/composite.h')
| -rw-r--r-- | include/linux/usb/composite.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/usb/composite.h b/include/linux/usb/composite.h index 60f8815998bd..65ae0a3feb5b 100644 --- a/include/linux/usb/composite.h +++ b/include/linux/usb/composite.h @@ -358,7 +358,7 @@ struct usb_composite_dev { struct list_head configs; struct usb_composite_driver *driver; u8 next_string_id; - u8 manufacturer_override; + char *def_manufacturer; /* the gadget driver won't enable the data pullup * while the deactivation count is nonzero. |