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

Commit 63b5c1c4 authored by Patrick Boettcher's avatar Patrick Boettcher Committed by Linus Torvalds
Browse files

[PATCH] dvb: usb/pci: correct syntax of driver name fields 



Change the name-field of the pci_driver and usb_driver structs to the name of
the module after compilation.  It seems that this field is used in some places
where special characters are not allowed.  Thanks to Alan Halverson for
finding this problem.

Signed-off-by: default avatarPatrick Boettcher <pb@linuxtv.org>
Signed-off-by: default avatarJohannes Stezenbach <js@linuxtv.org>
Cc: Greg KH <greg@kroah.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent d8667cbb

drivers/media/dvb/b2c2/flexcop-pci.c

+1 −1
Original line number Diff line number Diff line
@@ -409,7 +409,7 @@ static struct pci_device_id flexcop_pci_tbl[] = { 
MODULE_DEVICE_TABLE(pci, flexcop_pci_tbl);



static struct pci_driver flexcop_pci_driver = {

	.name     = "Technisat/B2C2 FlexCop II/IIb PCI",

	.name     = "b2c2_flexcop_pci",

	.id_table = flexcop_pci_tbl,

	.probe    = flexcop_pci_probe,

	.remove   = flexcop_pci_remove,

drivers/media/dvb/b2c2/flexcop-usb.c

+1 −1
Original line number Diff line number Diff line
@@ -545,7 +545,7 @@ static struct usb_device_id flexcop_usb_table [] = { 
/* usb specific object needed to register this driver with the usb subsystem */

static struct usb_driver flexcop_usb_driver = {

	.owner		= THIS_MODULE,

	.name		= "Technisat/B2C2 FlexCop II/IIb/III USB",

	.name		= "b2c2_flexcop_usb",

	.probe		= flexcop_usb_probe,

	.disconnect = flexcop_usb_disconnect,

	.id_table	= flexcop_usb_table,

drivers/media/dvb/dvb-usb/a800.c

+1 −1
Original line number Diff line number Diff line
@@ -149,7 +149,7 @@ static struct dvb_usb_properties a800_properties = { 


static struct usb_driver a800_driver = {

	.owner		= THIS_MODULE,

	.name		= "AVerMedia AverTV DVB-T USB 2.0 (A800)",

	.name		= "dvb_usb_a800",

	.probe		= a800_probe,

	.disconnect = dvb_usb_device_exit,

	.id_table	= a800_table,

drivers/media/dvb/dvb-usb/cxusb.c

+1 −1
Original line number Diff line number Diff line
@@ -262,7 +262,7 @@ static struct dvb_usb_properties cxusb_properties = { 


static struct usb_driver cxusb_driver = {

	.owner		= THIS_MODULE,

	.name		= "cxusb",

	.name		= "dvb_usb_cxusb",

	.probe		= cxusb_probe,

	.disconnect = dvb_usb_device_exit,

	.id_table	= cxusb_table,

drivers/media/dvb/dvb-usb/dibusb-mb.c

+1 −1
Original line number Diff line number Diff line
@@ -317,7 +317,7 @@ static struct dvb_usb_properties dibusb2_0b_properties = { 


static struct usb_driver dibusb_driver = {

	.owner		= THIS_MODULE,

	.name		= "DiBcom based USB DVB-T devices (DiB3000M-B based)",

	.name		= "dvb_usb_dibusb_mb",

	.probe		= dibusb_probe,

	.disconnect = dvb_usb_device_exit,

	.id_table	= dibusb_dib3000mb_table,