From e6a3754bdb1402be836c501d6f4ac500ee82181a Mon Sep 17 00:00:00 2001 From: Andy Walls Date: Tue, 28 Jul 2009 11:50:14 -0300 Subject: [PATCH] --- yaml --- r: 161495 b: refs/heads/master c: f5d887ae60ea1b05fcdab65e51e1ef88398ed274 h: refs/heads/master i: 161493: 6465f52102fbf5537df34abd307fa4f8b17506e6 161491: 4af300f1a2c9cbe8c83dd3103340e27aa6774852 161487: 0e87a7ca4b1db47ebacc5679df9ebdf51ca1c118 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/ir-kbd-i2c.c | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 5a940e2e587f..8d9a9fc8c5c1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8ca955689a957ecf956bb052f60412da2753a977 +refs/heads/master: f5d887ae60ea1b05fcdab65e51e1ef88398ed274 diff --git a/trunk/drivers/media/video/ir-kbd-i2c.c b/trunk/drivers/media/video/ir-kbd-i2c.c index f144acc400cd..b92ddcabf0b6 100644 --- a/trunk/drivers/media/video/ir-kbd-i2c.c +++ b/trunk/drivers/media/video/ir-kbd-i2c.c @@ -357,9 +357,11 @@ static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id) case 0x47: case 0x71: case 0x2d: - if (adap->id == I2C_HW_B_CX2388x) { + if (adap->id == I2C_HW_B_CX2388x || + adap->id == I2C_HW_B_CX2341X) { /* Handled by cx88-input */ - name = "CX2388x remote"; + name = adap->id == I2C_HW_B_CX2341X ? "CX2341x remote" + : "CX2388x remote"; ir_type = IR_TYPE_RC5; ir->get_key = get_key_haup_xvr; if (hauppauge == 1) { @@ -483,7 +485,8 @@ static int ir_remove(struct i2c_client *client) static const struct i2c_device_id ir_kbd_id[] = { /* Generic entry for any IR receiver */ { "ir_video", 0 }, - /* IR device specific entries could be added here */ + /* IR device specific entries should be added here */ + { "ir_rx_z8f0811_haup", 0 }, { } };