diff options
author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2013-01-04 15:37:26 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2013-01-04 16:13:19 -0500 |
commit | d40580e7c043cdfbf472e76052a4606fea16642d (patch) | |
tree | b87829814faf391a7474d7869ab37e34625d4e0f | |
parent | 728f9778e273a11a65926ac21574e6ca8d911ebf (diff) |
[media] em28xx: simplify IR names on I2C devices
The ir-i2c-kbd already adds I2C IR before the name. The way it is,
the devices are named as:
"i2c IR (i2c IR (EM2840 Hauppaug"
With is ugly and incorrect. After this patch, it is now properly
displayed as:
"i2c IR (WinTV USB2)"
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r-- | drivers/media/usb/em28xx/em28xx-input.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/usb/em28xx/em28xx-input.c b/drivers/media/usb/em28xx/em28xx-input.c index 2a1b3d277db1..ebbb0aa51dfa 100644 --- a/drivers/media/usb/em28xx/em28xx-input.c +++ b/drivers/media/usb/em28xx/em28xx-input.c | |||
@@ -472,22 +472,22 @@ static void em28xx_register_i2c_ir(struct em28xx *dev) | |||
472 | case EM2820_BOARD_TERRATEC_CINERGY_250: | 472 | case EM2820_BOARD_TERRATEC_CINERGY_250: |
473 | dev->init_data.ir_codes = RC_MAP_EM_TERRATEC; | 473 | dev->init_data.ir_codes = RC_MAP_EM_TERRATEC; |
474 | dev->init_data.get_key = em28xx_get_key_terratec; | 474 | dev->init_data.get_key = em28xx_get_key_terratec; |
475 | dev->init_data.name = "i2c IR (EM28XX Terratec)"; | 475 | dev->init_data.name = "Terratec Cinergy 200/250"; |
476 | break; | 476 | break; |
477 | case EM2820_BOARD_PINNACLE_USB_2: | 477 | case EM2820_BOARD_PINNACLE_USB_2: |
478 | dev->init_data.ir_codes = RC_MAP_PINNACLE_GREY; | 478 | dev->init_data.ir_codes = RC_MAP_PINNACLE_GREY; |
479 | dev->init_data.get_key = em28xx_get_key_pinnacle_usb_grey; | 479 | dev->init_data.get_key = em28xx_get_key_pinnacle_usb_grey; |
480 | dev->init_data.name = "i2c IR (EM28XX Pinnacle PCTV)"; | 480 | dev->init_data.name = "Pinnacle USB2"; |
481 | break; | 481 | break; |
482 | case EM2820_BOARD_HAUPPAUGE_WINTV_USB_2: | 482 | case EM2820_BOARD_HAUPPAUGE_WINTV_USB_2: |
483 | dev->init_data.ir_codes = RC_MAP_HAUPPAUGE; | 483 | dev->init_data.ir_codes = RC_MAP_HAUPPAUGE; |
484 | dev->init_data.get_key = em28xx_get_key_em_haup; | 484 | dev->init_data.get_key = em28xx_get_key_em_haup; |
485 | dev->init_data.name = "i2c IR (EM2840 Hauppauge)"; | 485 | dev->init_data.name = "WinTV USB2"; |
486 | break; | 486 | break; |
487 | case EM2820_BOARD_LEADTEK_WINFAST_USBII_DELUXE: | 487 | case EM2820_BOARD_LEADTEK_WINFAST_USBII_DELUXE: |
488 | dev->init_data.ir_codes = RC_MAP_WINFAST_USBII_DELUXE; | 488 | dev->init_data.ir_codes = RC_MAP_WINFAST_USBII_DELUXE; |
489 | dev->init_data.get_key = em28xx_get_key_winfast_usbii_deluxe; | 489 | dev->init_data.get_key = em28xx_get_key_winfast_usbii_deluxe; |
490 | dev->init_data.name = "i2c IR (EM2820 Winfast TV USBII Deluxe)"; | 490 | dev->init_data.name = "Winfast TV USBII Deluxe"; |
491 | break; | 491 | break; |
492 | } | 492 | } |
493 | 493 | ||