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

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

drivers/media/pci/saa7134/saa7134-input.c

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

drivers/media/pci/saa7134/saa7134.h

+0 −1
Original line number Diff line number Diff line
@@ -123,7 +123,6 @@ struct saa7134_format { 
struct saa7134_card_ir {

	struct rc_dev		*dev;



	char                    name[32];

	char                    phys[32];

	unsigned                users;

CRA Git | Maintained and supported by SUSTech CRA and CCSE