Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 68c91d37 authored by Yann Droneaud's avatar Yann Droneaud Committed by Greg Kroah-Hartman
Browse files

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: default avatarYann Droneaud <ydroneaud@opteya.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 66591015

drivers/usb/serial/usb-serial-simple.c

+1 −1
Original line number Diff line number Diff line
@@ -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,				\