]> git.openfabrics.org - ~shefty/rdma-dev.git/commitdiff
[media] em28xx: simplify IR names on I2C devices
authorMauro Carvalho Chehab <mchehab@redhat.com>
Fri, 4 Jan 2013 20:37:26 +0000 (17:37 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Fri, 4 Jan 2013 21:13:19 +0000 (19:13 -0200)
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>
drivers/media/usb/em28xx/em28xx-input.c

index 2a1b3d277db18c4436f08d83aad0eb16e7e0dd83..ebbb0aa51dfad9c0aef57d705965aca4d50f7cd0 100644 (file)
@@ -472,22 +472,22 @@ static void em28xx_register_i2c_ir(struct em28xx *dev)
        case EM2820_BOARD_TERRATEC_CINERGY_250:
                dev->init_data.ir_codes = RC_MAP_EM_TERRATEC;
                dev->init_data.get_key = em28xx_get_key_terratec;
-               dev->init_data.name = "i2c IR (EM28XX Terratec)";
+               dev->init_data.name = "Terratec Cinergy 200/250";
                break;
        case EM2820_BOARD_PINNACLE_USB_2:
                dev->init_data.ir_codes = RC_MAP_PINNACLE_GREY;
                dev->init_data.get_key = em28xx_get_key_pinnacle_usb_grey;
-               dev->init_data.name = "i2c IR (EM28XX Pinnacle PCTV)";
+               dev->init_data.name = "Pinnacle USB2";
                break;
        case EM2820_BOARD_HAUPPAUGE_WINTV_USB_2:
                dev->init_data.ir_codes = RC_MAP_HAUPPAUGE;
                dev->init_data.get_key = em28xx_get_key_em_haup;
-               dev->init_data.name = "i2c IR (EM2840 Hauppauge)";
+               dev->init_data.name = "WinTV USB2";
                break;
        case EM2820_BOARD_LEADTEK_WINFAST_USBII_DELUXE:
                dev->init_data.ir_codes = RC_MAP_WINFAST_USBII_DELUXE;
                dev->init_data.get_key = em28xx_get_key_winfast_usbii_deluxe;
-               dev->init_data.name = "i2c IR (EM2820 Winfast TV USBII Deluxe)";
+               dev->init_data.name = "Winfast TV USBII Deluxe";
                break;
        }