From: Dave Jones DVB null terminates its device names, which seems odd, and should be unnecessary. Signed-off-by: Dave Jones Acked-by: Alan Cox Cc: Mauro Carvalho Chehab Signed-off-by: Andrew Morton --- drivers/media/dvb/ttpci/av7110.c | 2 +- drivers/media/dvb/ttpci/budget-ci.c | 2 +- drivers/media/dvb/ttpci/budget-patch.c | 2 +- drivers/media/dvb/ttpci/budget.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff -puN drivers/media/dvb/ttpci/av7110.c~remove-null-chars-from-dvb-names drivers/media/dvb/ttpci/av7110.c --- a/drivers/media/dvb/ttpci/av7110.c~remove-null-chars-from-dvb-names +++ a/drivers/media/dvb/ttpci/av7110.c @@ -2823,7 +2823,7 @@ MODULE_DEVICE_TABLE(pci, pci_tbl); static struct saa7146_extension av7110_extension = { - .name = "dvb\0", + .name = "dvb", .flags = SAA7146_I2C_SHORT_DELAY, .module = THIS_MODULE, diff -puN drivers/media/dvb/ttpci/budget-ci.c~remove-null-chars-from-dvb-names drivers/media/dvb/ttpci/budget-ci.c --- a/drivers/media/dvb/ttpci/budget-ci.c~remove-null-chars-from-dvb-names +++ a/drivers/media/dvb/ttpci/budget-ci.c @@ -1153,7 +1153,7 @@ static struct pci_device_id pci_tbl[] = MODULE_DEVICE_TABLE(pci, pci_tbl); static struct saa7146_extension budget_extension = { - .name = "budget_ci dvb\0", + .name = "budget_ci dvb", .flags = SAA7146_I2C_SHORT_DELAY, .module = THIS_MODULE, diff -puN drivers/media/dvb/ttpci/budget-patch.c~remove-null-chars-from-dvb-names drivers/media/dvb/ttpci/budget-patch.c --- a/drivers/media/dvb/ttpci/budget-patch.c~remove-null-chars-from-dvb-names +++ a/drivers/media/dvb/ttpci/budget-patch.c @@ -647,7 +647,7 @@ static void __exit budget_patch_exit(voi } static struct saa7146_extension budget_extension = { - .name = "budget_patch dvb\0", + .name = "budget_patch dvb", .flags = 0, .module = THIS_MODULE, diff -puN drivers/media/dvb/ttpci/budget.c~remove-null-chars-from-dvb-names drivers/media/dvb/ttpci/budget.c --- a/drivers/media/dvb/ttpci/budget.c~remove-null-chars-from-dvb-names +++ a/drivers/media/dvb/ttpci/budget.c @@ -516,7 +516,7 @@ static struct pci_device_id pci_tbl[] = MODULE_DEVICE_TABLE(pci, pci_tbl); static struct saa7146_extension budget_extension = { - .name = "budget dvb\0", + .name = "budget dvb", .flags = SAA7146_I2C_SHORT_DELAY, .module = THIS_MODULE, _