Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 141841 | Differences between
and this patch

Collapse All | Expand All

(-)drivers/lirc_i2c/lirc_i2c.c (-3 / +16 lines)
Lines 430-441 Link Here
430
		break;
430
		break;
431
	case 0x18:
431
	case 0x18:
432
	case 0x1a:
432
	case 0x1a:
433
		if (adap->id == (I2C_ALGO_BIT | I2C_HW_B_BT848)) {
433
#ifdef I2C_HW_B_CX2341X
434
		if (adap->id == (I2C_ALGO_BIT | I2C_HW_B_BT848) ||
435
		    adap->id == (I2C_ALGO_BIT | I2C_HW_B_CX2341X))
436
#else
437
		if (adap->id == (I2C_ALGO_BIT | I2C_HW_B_BT848))
438
#endif
439
		{
434
			strcpy(ir->c.name,"Hauppauge IR");
440
			strcpy(ir->c.name,"Hauppauge IR");
435
			ir->l.code_length = 13;
441
			ir->l.code_length = 13;
436
			ir->l.add_to_buf=add_to_buf_haup;
442
			ir->l.add_to_buf=add_to_buf_haup;
437
		}
443
		}
438
		else {
444
		else /* I2C_HW_B_CX2388x */
445
		{
439
			strcpy(ir->c.name,"Leadtek IR");
446
			strcpy(ir->c.name,"Leadtek IR");
440
			ir->l.code_length = 8;
447
			ir->l.code_length = 8;
441
			ir->l.add_to_buf=add_to_buf_pvr2000;
448
			ir->l.add_to_buf=add_to_buf_pvr2000;
Lines 508-514 Link Here
508
		-1};
515
		-1};
509
	struct i2c_client c; char buf; int i,rc;
516
	struct i2c_client c; char buf; int i,rc;
510
517
511
	if (adap->id == (I2C_ALGO_BIT | I2C_HW_B_BT848)) {
518
#ifdef I2C_HW_B_CX2341X
519
	if (adap->id == (I2C_ALGO_BIT | I2C_HW_B_BT848) ||
520
	    adap->id == (I2C_ALGO_BIT | I2C_HW_B_CX2341X))
521
#else
522
	if (adap->id == (I2C_ALGO_BIT | I2C_HW_B_BT848))
523
#endif
524
	{
512
		memset(&c,0,sizeof(c));
525
		memset(&c,0,sizeof(c));
513
		c.adapter = adap;
526
		c.adapter = adap;
514
		for (i = 0; -1 != probe[i]; i++) {
527
		for (i = 0; -1 != probe[i]; i++) {

Return to bug 141841