Commit 9916ac07 authored by Sean Young's avatar Sean Young Committed by Mauro Carvalho Chehab

media: saa7134: rc device does not need 'saa7134 IR (' prefix

Before this patch, the rc name is truncated to:

	saa7134 IR (Hauppauge WinTV-HVR

Now it is:

	Hauppauge WinTV-HVR1150 ATSC/QAM-Hybrid
Signed-off-by: default avatarSean Young <sean@mess.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parent 8d023a57
...@@ -880,8 +880,6 @@ int saa7134_input_init1(struct saa7134_dev *dev) ...@@ -880,8 +880,6 @@ int saa7134_input_init1(struct saa7134_dev *dev)
ir->raw_decode = raw_decode; ir->raw_decode = raw_decode;
/* init input device */ /* init input device */
snprintf(ir->name, sizeof(ir->name), "saa7134 IR (%s)",
saa7134_boards[dev->board].name);
snprintf(ir->phys, sizeof(ir->phys), "pci-%s/ir0", snprintf(ir->phys, sizeof(ir->phys), "pci-%s/ir0",
pci_name(dev->pci)); pci_name(dev->pci));
...@@ -893,7 +891,7 @@ int saa7134_input_init1(struct saa7134_dev *dev) ...@@ -893,7 +891,7 @@ int saa7134_input_init1(struct saa7134_dev *dev)
rc->allowed_protocols = RC_PROTO_BIT_ALL_IR_DECODER; rc->allowed_protocols = RC_PROTO_BIT_ALL_IR_DECODER;
} }
rc->device_name = ir->name; rc->device_name = saa7134_boards[dev->board].name;
rc->input_phys = ir->phys; rc->input_phys = ir->phys;
rc->input_id.bustype = BUS_PCI; rc->input_id.bustype = BUS_PCI;
rc->input_id.version = 1; rc->input_id.version = 1;
......
...@@ -123,7 +123,6 @@ struct saa7134_format { ...@@ -123,7 +123,6 @@ struct saa7134_format {
struct saa7134_card_ir { struct saa7134_card_ir {
struct rc_dev *dev; struct rc_dev *dev;
char name[32];
char phys[32]; char phys[32];
unsigned users; unsigned users;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment