diff options
| author | Yann Droneaud <ydroneaud@opteya.com> | 2013-08-18 21:29:00 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-08-18 22:11:06 +0200 |
| commit | 68c91d377c9bd14cbe35c647ed3b847f7862c958 (patch) | |
| tree | b5dd49d5ee7f15df352f22cc19378be79002d149 /drivers/usb/serial | |
| parent | USB: WUSBCORE: Use usb_init_urb instead of creating the URB manually (diff) | |
| download | linux-68c91d377c9bd14cbe35c647ed3b847f7862c958.tar.xz linux-68c91d377c9bd14cbe35c647ed3b847f7862c958.zip | |
USB: serial: fix stringify operator in usb-serial-simple
usb-serial-simple uses an unknown stringify macro that make
all drivers being named "stringify(vendor)".
This can be a problem when two drivers have the same (wrong) name:
kernel: usbcore: registered new interface driver usb_serial_simple
kernel: usbserial: USB Serial support registered for stringify(vendor)
kernel Error: Driver 'stringify(vendor)' is already registered, aborting...
kernel: usbserial: problem -16 when registering driver stringify(vendor)
kernel: usbserial: USB Serial deregistering driver stringify(vendor)
kernel: usbcore: deregistering interface driver usb_serial_simple
Before the fix:
$ strings drivers/usb/serial/usb-serial-simple.o
usb_serial_simple
stringify(vendor)
After the fix:
$ strings drivers/usb/serial/usb-serial-simple.o
usb_serial_simple
funsoft
flashloader
vivopay
moto_modem
hp4x
suunto
siemens_mpi
This patch makes usb-serial-simple use the correct stringify operator.
Signed-off-by: Yann Droneaud <ydroneaud@opteya.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/serial')
| -rw-r--r-- | drivers/usb/serial/usb-serial-simple.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/serial/usb-serial-simple.c b/drivers/usb/serial/usb-serial-simple.c index 6a06131f48f4..52eb91f2eb2a 100644 --- a/drivers/usb/serial/usb-serial-simple.c +++ b/drivers/usb/serial/usb-serial-simple.c @@ -29,7 +29,7 @@ static const struct usb_device_id vendor##_id_table[] = { \ static struct usb_serial_driver vendor##_device = { \ .driver = { \ .owner = THIS_MODULE, \ - .name = "stringify(vendor)", \ + .name = #vendor, \ }, \ .id_table = vendor##_id_table, \ .num_ports = 1, \ |