Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/cooloney...

[linux-2.6] / drivers / media / video / ir-kbd-i2c.c

diff --git a/drivers/media/video/ir-kbd-i2c.c b/drivers/media/video/ir-kbd-i2c.c
index 3d5a28c2c9293485547f0a3805e12b93ed62ff47..29779d8bf7fbecbc0e33ade96d51a75ef0c30e03 100644 (file)
--- a/drivers/media/video/ir-kbd-i2c.c
+++ b/drivers/media/video/ir-kbd-i2c.c
@@ -143,7 +143,7 @@ static int get_key_pv951(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw)
        return 1;
 }
 
-static int get_key_fusion_gold(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw)
+static int get_key_fusionhdtv(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw)
 {
        unsigned char buf[4];
 
@@ -154,7 +154,7 @@ static int get_key_fusion_gold(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw)
        }
 
        if(buf[0] !=0 || buf[1] !=0 || buf[2] !=0 || buf[3] != 0)
-               dprintk(2, "ir fusion gold: 0x%2x 0x%2x 0x%2x 0x%2x\n",
+               dprintk(2, "%s: 0x%2x 0x%2x 0x%2x 0x%2x\n", __FUNCTION__,
                        buf[0], buf[1], buf[2], buf[3]);
 
        /* no key pressed or signal from other ir remote */
@@ -165,10 +165,8 @@ static int get_key_fusion_gold(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw)
        *ir_raw = (buf[2] << 8) | buf[3];
 
        return 1;
-
 }
 
-
 static int get_key_knc1(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw)
 {
        unsigned char b;
@@ -392,10 +390,10 @@ static int ir_attach(struct i2c_adapter *adap, int addr,
                ir_codes    = ir_codes_empty;
                break;
        case 0x6b:
-               name        = "FusionGold";
-               ir->get_key = get_key_fusion_gold;
+               name        = "FusionHDTV";
+               ir->get_key = get_key_fusionhdtv;
                ir_type     = IR_TYPE_RC5;
-               ir_codes    = ir_codes_fusion_gold;
+               ir_codes    = ir_codes_fusionhdtv_mce;
                break;
        case 0x7a:
        case 0x47:
@@ -509,6 +507,7 @@ static int ir_probe(struct i2c_adapter *adap)
        static const int probe_saa7134[] = { 0x7a, 0x47, 0x71, -1 };
        static const int probe_em28XX[] = { 0x30, 0x47, -1 };
        static const int probe_cx88[] = { 0x18, 0x6b, 0x71, -1 };
+       static const int probe_cx23885[] = { 0x6b, -1 };
        const int *probe = NULL;
        struct i2c_client c;
        unsigned char buf;
@@ -530,6 +529,9 @@ static int ir_probe(struct i2c_adapter *adap)
        case I2C_HW_B_CX2388x:
                probe = probe_cx88;
                break;
+       case I2C_HW_B_CX23885:
+               probe = probe_cx23885;
+               break;
        }
        if (NULL == probe)
                return 0;