diff options
| author | Sean Young <sean@mess.org> | 2018-10-26 17:13:25 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab+samsung@kernel.org> | 2018-11-22 19:30:06 +0100 |
| commit | 9916ac07cd7958a6b0a85bf4a498dde9ce7abb63 (patch) | |
| tree | 52c1c079d07978ed41467d25cf99321e522c81de | |
| parent | media: rc: imon_raw: use fls rather than loop per bit (diff) | |
| download | linux-9916ac07cd7958a6b0a85bf4a498dde9ce7abb63.tar.xz linux-9916ac07cd7958a6b0a85bf4a498dde9ce7abb63.zip | |
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: Sean Young <sean@mess.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
| -rw-r--r-- | drivers/media/pci/saa7134/saa7134-input.c | 4 | ||||
| -rw-r--r-- | drivers/media/pci/saa7134/saa7134.h | 1 |
2 files changed, 1 insertions, 4 deletions
diff --git a/drivers/media/pci/saa7134/saa7134-input.c b/drivers/media/pci/saa7134/saa7134-input.c index 999b2774b220..6e6d68964017 100644 --- a/drivers/media/pci/saa7134/saa7134-input.c +++ b/drivers/media/pci/saa7134/saa7134-input.c @@ -880,8 +880,6 @@ int saa7134_input_init1(struct saa7134_dev *dev) ir->raw_decode = raw_decode; /* 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", pci_name(dev->pci)); @@ -893,7 +891,7 @@ int saa7134_input_init1(struct saa7134_dev *dev) 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_id.bustype = BUS_PCI; rc->input_id.version = 1; diff --git a/drivers/media/pci/saa7134/saa7134.h b/drivers/media/pci/saa7134/saa7134.h index 480228456014..1c3f273f7dd2 100644 --- a/drivers/media/pci/saa7134/saa7134.h +++ b/drivers/media/pci/saa7134/saa7134.h @@ -123,7 +123,6 @@ struct saa7134_format { struct saa7134_card_ir { struct rc_dev *dev; - char name[32]; char phys[32]; unsigned users; |